build: v1.5.2-api兼容

fix: 整理日志、添加颜色、使用统一的日志函数以提高日志可读性

docs/changelogs/CHANGELOG.v1.5.2.md

@@ -0,0 +1,13 @@
+# v1.5.2
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 替换Uid/Uin为内部实现
+* 增加HttpApi调用稳定性
+* 修复 GetMsg 兼容性
+
+## 新增与调整
+* 支持真正意义上的陌生人信息获取 Api: GoCQHTTP_GetStrangerInfo
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.4.4.md

@@ -1,10 +1,10 @@
-# v1.4.4
-
-QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
-
-## 更新
-* **重大更新：**更新了版本号
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)
-
+# v1.4.4
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 更新
+* **重大更新：**更新了版本号
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)
+

docs/changelogs/old/CHANGELOG.v1.4.5.md

@@ -0,0 +1,12 @@
+# v1.4.5
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 紧急修复二维扫码问题
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)
+

docs/changelogs/old/CHANGELOG.v1.4.6.md

@@ -0,0 +1,12 @@
+# v1.4.6
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 优化整体稳定性
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)
+

docs/changelogs/old/CHANGELOG.v1.4.7.md

@@ -0,0 +1,11 @@
+# v1.4.7
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 临时扩展 Api: GoCQHTTPUploadGroupFile folder_id字段 用于选择文件夹
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.4.8.md

@@ -0,0 +1,12 @@
+# v1.4.8
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 优化Guid的生成方式
+* 支持临时消息获取群来源
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.4.9.md

@@ -0,0 +1,11 @@
+# v1.4.9
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 修复接口调用问题 接口标准化 API：set_group_add_request
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.0.md

@@ -0,0 +1,11 @@
+# v1.5.0
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 修正各Api默认值
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.1.md

@@ -0,0 +1,12 @@
+# v1.5.1
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 支持 新Api: set_self_profile 可设置个性签名
+* 修复 Api: get_group_system_msg
+* 整理日志、添加颜色、使用统一的日志函数以提高日志可读性
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "1.4.4",
+  "version": "1.5.1",
   "scripts": {
     "watch:dev": "vite --mode development",
     "watch:prod": "vite --mode production",
@@ -19,6 +19,7 @@
   },
   "devDependencies": {
     "@log4js-node/log4js-api": "^1.0.2",
+    "@protobuf-ts/plugin": "^2.9.4",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/cors": "^2.8.17",
@@ -43,11 +44,11 @@
     "vite": "^5.2.6",
     "vite-plugin-cp": "^4.0.8",
     "vite-plugin-dts": "^3.8.2",
-    "vite-tsconfig-paths": "^4.3.2",
-    "@protobuf-ts/plugin": "^2.9.4"
+    "vite-tsconfig-paths": "^4.3.2"
   },
   "dependencies": {
     "ajv": "^8.13.0",
+    "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "cors": "^2.8.5",
     "express": "^5.0.0-beta.2",

src/common/utils/AsyncQueue.ts

@@ -1,5 +1,5 @@
 import { sleep } from '@/common/utils/helper';
-
+import { logError } from './log';
 type AsyncQueueTask = (() => void) | (()=>Promise<void>);
 
 
@@ -26,7 +26,8 @@ export class AsyncQueue {
           await taskRet;
         }
       } catch (e) {
-        console.error(e);
+        // console.error(e);
+        logError(e);
       }
       this.tasks.shift();
       await sleep(100);

src/common/utils/EventTask.ts

@@ -1,99 +1,182 @@
-import { randomUUID } from "crypto";
-export enum NTEventMode {
-    Once = 1,
-    Twice = 2
-}
-export interface NTEventType<U extends (...args: any[]) => any> {
-    EventName: string,
-    EventFunction: U,
-    ListenerName: string,
-    ListenerFunction: Function
-}
-interface Internal_MapKey {
-    mode: NTEventMode,
-    timeout: number,
-    createtime: number,
-    func: Function
-}
-export class NTEvent<T extends (...args: any[]) => any, R = any> {
-    EventData: NTEventType<T>;
-    EventTask: Map<string, Internal_MapKey> = new Map<string, Internal_MapKey>();
-    constructor(params: NTEventType<T>) {
-        params.ListenerFunction = this.DispatcherListener.bind(this);
-        this.EventData = params;
-        this.EventData.EventFunction = params.EventFunction.bind(this) as any;
-    }
-    async DispatcherListener(...args: any[]) {
-        console.log(...args);
-        this.EventTask.forEach((task, uuid) => {
-            if (task.createtime + task.timeout > Date.now()) {
-                this.EventTask.delete(uuid);
-                return;
-            }
-            task.func(...args);
-        })
-    }
-    async CallTwiceEvent(timeout: number = 3000, ...args: Parameters<T>) {
-        return new Promise<R>((resolve, reject) => {
-            const id = randomUUID();
-            let complete = 0;
-            let retData: R | undefined = undefined;
-            let databack = () => {
-                if (!complete) {
-                    this.EventTask.delete(id);
-                    reject(new Error('NTEvent EventName:' + this.EventData.EventName + ' EventListener:' + this.EventData.ListenerName + ' timeout'));
-                } else {
-                    resolve(retData as R);
-                }
-            }
-
-            let Timeouter = setTimeout(databack, timeout);
-
-            this.EventTask.set(id, {
-                mode: NTEventMode.Once,
-                timeout: timeout,
-                createtime: Date.now(),
-                func: (...args: any[]) => {
-                    complete++;
-                    retData = args as R;
-                    if (complete == 2) {
-                        clearTimeout(Timeouter);
-                        databack();
-                    }
-                }
-            });
-            this.EventData.EventFunction(...args);
-        });
-    }
-
-    async CallOnceEvent(timeout: number = 3000, ...args: Parameters<T>) {
-        return new Promise<R>((resolve, reject) => {
-            const id = randomUUID();
-            let complete = false;
-            let retData: R | undefined = undefined;
-            let databack = () => {
-                if (!complete) {
-                    this.EventTask.delete(id);
-                    reject(new Error('NTEvent EventName:' + this.EventData.EventName + ' EventListener:' + this.EventData.ListenerName + ' timeout'));
-                } else {
-                    resolve(retData as R);
-                }
-            }
-            let Timeouter = setTimeout(databack, timeout);
-
-            this.EventTask.set(id, {
-                mode: NTEventMode.Once,
-                timeout: timeout,
-                createtime: Date.now(),
-                func: (...args: any[]) => {
-                    clearTimeout(Timeouter);
-                    complete = true;
-                    retData = args as R;
-                    databack();
-                }
-            });
-            this.EventData.EventFunction(...args);
-        });
-    }
-}
-
+import { NodeIKernelMsgListener } from '@/core';
+import { NodeIQQNTWrapperSession } from '@/core/wrapper';
+import { randomUUID } from 'crypto';
+
+interface Internal_MapKey {
+  timeout: number,
+  createtime: number,
+  func: (...arg: any[]) => any,
+}
+
+export class ListenerClassBase {
+  [key: string]: string;
+}
+
+export interface ListenerIBase {
+  // eslint-disable-next-line @typescript-eslint/no-misused-new
+  new(listener: any): ListenerClassBase;
+}
+
+export class NTEventWrapper {
+
+  private ListenerMap: { [key: string]: ListenerIBase } | undefined;//ListenerName-Unique -> Listener构造函数
+  private WrapperSession: NodeIQQNTWrapperSession | undefined;//WrapperSession
+  private ListenerManger: Map<string, ListenerClassBase> = new Map<string, ListenerClassBase>(); //ListenerName-Unique -> Listener实例
+  private EventTask = new Map<string, Map<string, Map<string, Internal_MapKey>>>();//tasks ListenerMainName -> ListenerSubName-> uuid -> {timeout,createtime,func}
+  constructor() {
+
+  }
+  createProxyDispatch(ListenerMainName: string) {
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    const current = this;
+    return new Proxy({}, {
+      get(target: any, prop: any, receiver: any) {
+        // console.log('get', prop, typeof target[prop]);
+        if (typeof target[prop] === 'undefined') {
+          // 如果方法不存在，返回一个函数，这个函数调用existentMethod
+          return (...args: any[]) => {
+            current.DispatcherListener.apply(current, [ListenerMainName, prop, ...args]).then();
+          };
+        }
+        // 如果方法存在，正常返回
+        return Reflect.get(target, prop, receiver);
+      }
+    });
+  }
+  init({ ListenerMap, WrapperSession }: { ListenerMap: { [key: string]: typeof ListenerClassBase }, WrapperSession: NodeIQQNTWrapperSession }) {
+    this.ListenerMap = ListenerMap;
+    this.WrapperSession = WrapperSession;
+  }
+  CreatEventFunction<T extends (...args: any) => any>(eventName: string): T | undefined {
+    const eventNameArr = eventName.split('/');
+    type eventType = {
+      [key: string]: () => { [key: string]: (...params: Parameters<T>) => Promise<ReturnType<T>> }
+    }
+    if (eventNameArr.length > 1) {
+      const serviceName = 'get' + eventNameArr[0].replace('NodeIKernel', '');
+      const eventName = eventNameArr[1];
+      //getNodeIKernelGroupListener,GroupService
+      //console.log('2', eventName);
+      const services = (this.WrapperSession as unknown as eventType)[serviceName]();
+      let event = services[eventName];
+      //重新绑定this
+      event = event.bind(services);
+      if (event) {
+        return event as T;
+      }
+      return undefined;
+    }
+
+  }
+  CreatListenerFunction<T>(listenerMainName: string, uniqueCode: string = ''): T {
+    const ListenerType = this.ListenerMap![listenerMainName];
+    let Listener = this.ListenerManger.get(listenerMainName + uniqueCode);
+    if (!Listener && ListenerType) {
+      Listener = new ListenerType(this.createProxyDispatch(listenerMainName));
+      const ServiceSubName = listenerMainName.match(/^NodeIKernel(.*?)Listener$/)![1];
+      const Service = 'NodeIKernel' + ServiceSubName + 'Service/addKernel' + ServiceSubName + 'Listener';
+      const addfunc = this.CreatEventFunction<(listener: T) => number>(Service);
+      addfunc!(Listener as T);
+      //console.log(addfunc!(Listener as T));
+      this.ListenerManger.set(listenerMainName + uniqueCode, Listener);
+    }
+    return Listener as T;
+  }
+  //统一回调清理事件
+  async DispatcherListener(ListenerMainName: string, ListenerSubName: string, ...args: any[]) {
+    //console.log(ListenerMainName, this.EventTask.get(ListenerMainName), ListenerSubName, this.EventTask.get(ListenerMainName)?.get(ListenerSubName));
+    this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.forEach((task, uuid) => {
+      //console.log(task.func, uuid, task.createtime, task.timeout);
+      if (task.createtime + task.timeout < Date.now()) {
+        this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.delete(uuid);
+        return;
+      }
+      task.func(...args);
+    });
+  }
+  async CallNoListenerEvent<EventType extends (...args: any[]) => Promise<any>,>(EventName = '', timeout: number = 3000, ...args: Parameters<EventType>) {
+    return new Promise<Awaited<ReturnType<EventType>>>(async (resolve, reject) => {
+      const EventFunc = this.CreatEventFunction<EventType>(EventName);
+      let complete = false;
+      const Timeouter = setTimeout(() => {
+        if (!complete) {
+          reject(new Error('NTEvent EventName:' + EventName + ' timeout'));
+        }
+      }, timeout);
+      const retData = await EventFunc!(...args);
+      complete = true;
+      resolve(retData);
+    });
+  }
+  async CallNormalEvent<EventType extends (...args: any[]) => Promise<any>, ListenerType extends (...args: any[]) => void>(EventName = '', ListenerName = '', waitTimes = 1, timeout: number = 3000, ...args: Parameters<EventType>) {
+    return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(async (resolve, reject) => {
+      const id = randomUUID();
+      let complete = 0;
+      let retData: Parameters<ListenerType> | undefined = undefined;
+      let retEvent: any = {};
+      const databack = () => {
+        if (complete < waitTimes) {
+          reject(new Error('NTEvent EventName:' + EventName + ' ListenerName:' + ListenerName + ' timeout'));
+        } else {
+          resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
+        }
+      };
+      const Timeouter = setTimeout(databack, timeout);
+
+      const ListenerNameList = ListenerName.split('/');
+      const ListenerMainName = ListenerNameList[0];
+      const ListenerSubName = ListenerNameList[1];
+      const eventCallbak = {
+        timeout: timeout,
+        createtime: Date.now(),
+        func: (...args: any[]) => {
+          complete++;
+          //console.log('func', ...args);
+          retData = args as Parameters<ListenerType>;
+          if (complete >= waitTimes) {
+            clearTimeout(Timeouter);
+            databack();
+          }
+        }
+      };
+      if (!this.EventTask.get(ListenerMainName)) {
+        this.EventTask.set(ListenerMainName, new Map());
+      }
+      if (!(this.EventTask.get(ListenerMainName)?.get(ListenerSubName))) {
+        this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map());
+      }
+      this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak);
+      this.CreatListenerFunction(ListenerMainName);
+      const EventFunc = this.CreatEventFunction<EventType>(EventName);
+      //console.log("测试打点", args);
+      retEvent = await EventFunc!(...(args as any[]));
+    });
+  }
+}
+export const NTEventDispatch = new NTEventWrapper();
+
+// 示例代码 快速创建事件
+// let NTEvent = new NTEventWrapper();
+// let TestEvent = NTEvent.CreatEventFunction<(force: boolean) => Promise<Number>>('NodeIKernelProfileLikeService/GetTest');
+// if (TestEvent) {
+//     TestEvent(true);
+// }
+
+// 示例代码 快速创建监听Listener类
+// let NTEvent = new NTEventWrapper();
+// NTEvent.CreatListenerFunction<NodeIKernelMsgListener>('NodeIKernelMsgListener', 'core')
+
+
+// 调用接口
+//let NTEvent = new NTEventWrapper();
+//let ret = await NTEvent.CallNormalEvent<(force: boolean) => Promise<Number>, (data1: string, data2: number) => void>('NodeIKernelProfileLikeService/GetTest', 'NodeIKernelMsgListener/onAddSendMsg', 1, 3000, true);
+
+// 注册监听 解除监听
+// NTEventDispatch.RigisterListener('NodeIKernelMsgListener/onAddSendMsg','core',cb);
+// NTEventDispatch.UnRigisterListener('NodeIKernelMsgListener/onAddSendMsg','core');
+
+// let GetTest = NTEventDispatch.CreatEvent('NodeIKernelProfileLikeService/GetTest','NodeIKernelMsgListener/onAddSendMsg',Mode);
+// GetTest('test');
+
+// always模式
+// NTEventDispatch.CreatEvent('NodeIKernelProfileLikeService/GetTest','NodeIKernelMsgListener/onAddSendMsg',Mode,(...args:any[])=>{ console.log(args) });

src/common/utils/LRUCache.ts

@@ -1,145 +1,145 @@
-import { logError, logDebug } from "@/common/utils/log";
-
-type group_id = number;
-type user_id = number;
-
-class cacheNode<T> {
-  value: T;
-  groupId: group_id;
-  userId: user_id;
-  prev: cacheNode<T> | null;
-  next: cacheNode<T> | null;
-  timestamp: number;
-
-  constructor(groupId: group_id, userId: user_id, value: T) {
-    this.groupId = groupId;
-    this.userId = userId;
-    this.value = value;
-    this.prev = null;
-    this.next = null;
-    this.timestamp = Date.now();
-  }
-}
-
-type cache<T> = { [key: group_id]: { [key: user_id]: cacheNode<T> } };
-class LRU<T> {
-  private maxAge: number;
-  private maxSize: number;
-  private currentSize: number;
-  private cache: cache<T>;
-  private head: cacheNode<T> | null = null;
-  private tail: cacheNode<T> | null = null;
-  private onFuncs: ((node: cacheNode<T>) => void)[] = [];
-
-  constructor(maxAge: number = 2e4, maxSize: number = 5e3) {
-    this.maxAge = maxAge;
-    this.maxSize = maxSize;
-    this.cache = Object.create(null);
-    this.currentSize = 0;
-
-    if (maxSize == 0) return;
-    setInterval(() => this.removeExpired(), this.maxAge);
-  }
-
-  // 移除LRU节点
-  private removeLRUNode(node: cacheNode<T>) {
-    logDebug(
-      "removeLRUNode",
-      node.groupId,
-      node.userId,
-      node.value,
-      this.currentSize
-    );
-    node.prev = node.next = null;
-    delete this.cache[node.groupId][node.userId];
-    this.removeNode(node);
-    this.onFuncs.forEach((func) => func(node));
-    this.currentSize--;
-  }
-
-  public on(func: (node: cacheNode<T>) => void) {
-    this.onFuncs.push(func);
-  }
-
-  private removeExpired() {
-    const now = Date.now();
-    let current = this.tail;
-    const nodesToRemove: cacheNode<T>[] = [];
-    let removedCount = 0;
-
-    // 收集需要删除的节点
-    while (current && now - current.timestamp > this.maxAge) {
-      nodesToRemove.push(current);
-      current = current.prev;
-      removedCount++;
-      if (removedCount >= 100) break;
-    }
-
-    // 更新链表指向
-    if (nodesToRemove.length > 0) {
-      const newTail = nodesToRemove[nodesToRemove.length - 1].prev;
-      if (newTail) {
-        newTail.next = null;
-      } else {
-        this.head = null;
-      }
-      this.tail = newTail;
-    }
-
-    nodesToRemove.forEach((node) => {
-      node.prev = node.next = null;
-      delete this.cache[node.groupId][node.userId];
-
-      this.currentSize--;
-      this.onFuncs.forEach((func) => func(node));
-    });
-  }
-
-  private addNode(node: cacheNode<T>) {
-    node.next = this.head;
-    if (this.head) this.head.prev = node;
-    if (!this.tail) this.tail = node;
-    this.head = node;
-  }
-
-  private removeNode(node: cacheNode<T>) {
-    if (node.prev) node.prev.next = node.next;
-    if (node.next) node.next.prev = node.prev;
-    if (node === this.head) this.head = node.next;
-    if (node === this.tail) this.tail = node.prev;
-  }
-
-  private moveToHead(node: cacheNode<T>) {
-    if (this.head === node) return;
-
-    this.removeNode(node);
-    this.addNode(node);
-    node.prev = null;
-  }
-
-  public set(groupId: group_id, userId: user_id, value: T) {
-    if (!this.cache[groupId]) {
-      this.cache[groupId] = Object.create(null);
-    }
-
-    const groupObject = this.cache[groupId];
-
-    if (groupObject[userId]) {
-      const node = groupObject[userId];
-      node.value = value;
-      node.timestamp = Date.now();
-      this.moveToHead(node);
-    } else {
-      const node = new cacheNode(groupId, userId, value);
-      groupObject[userId] = node;
-      this.currentSize++;
-      this.addNode(node);
-      if (this.currentSize > this.maxSize) {
-        const tail = this.tail!;
-        this.removeLRUNode(tail);
-      }
-    }
-  }
-}
-
-export default LRU;
+import { logError, logDebug } from '@/common/utils/log';
+
+type group_id = number;
+type user_id = number;
+
+class cacheNode<T> {
+  value: T;
+  groupId: group_id;
+  userId: user_id;
+  prev: cacheNode<T> | null;
+  next: cacheNode<T> | null;
+  timestamp: number;
+
+  constructor(groupId: group_id, userId: user_id, value: T) {
+    this.groupId = groupId;
+    this.userId = userId;
+    this.value = value;
+    this.prev = null;
+    this.next = null;
+    this.timestamp = Date.now();
+  }
+}
+
+type cache<T> = { [key: group_id]: { [key: user_id]: cacheNode<T> } };
+class LRU<T> {
+  private maxAge: number;
+  private maxSize: number;
+  private currentSize: number;
+  private cache: cache<T>;
+  private head: cacheNode<T> | null = null;
+  private tail: cacheNode<T> | null = null;
+  private onFuncs: ((node: cacheNode<T>) => void)[] = [];
+
+  constructor(maxAge: number = 2e4, maxSize: number = 5e3) {
+    this.maxAge = maxAge;
+    this.maxSize = maxSize;
+    this.cache = Object.create(null);
+    this.currentSize = 0;
+
+    if (maxSize == 0) return;
+    setInterval(() => this.removeExpired(), this.maxAge);
+  }
+
+  // 移除LRU节点
+  private removeLRUNode(node: cacheNode<T>) {
+    logDebug(
+      'removeLRUNode',
+      node.groupId,
+      node.userId,
+      node.value,
+      this.currentSize
+    );
+    node.prev = node.next = null;
+    delete this.cache[node.groupId][node.userId];
+    this.removeNode(node);
+    this.onFuncs.forEach((func) => func(node));
+    this.currentSize--;
+  }
+
+  public on(func: (node: cacheNode<T>) => void) {
+    this.onFuncs.push(func);
+  }
+
+  private removeExpired() {
+    const now = Date.now();
+    let current = this.tail;
+    const nodesToRemove: cacheNode<T>[] = [];
+    let removedCount = 0;
+
+    // 收集需要删除的节点
+    while (current && now - current.timestamp > this.maxAge) {
+      nodesToRemove.push(current);
+      current = current.prev;
+      removedCount++;
+      if (removedCount >= 100) break;
+    }
+
+    // 更新链表指向
+    if (nodesToRemove.length > 0) {
+      const newTail = nodesToRemove[nodesToRemove.length - 1].prev;
+      if (newTail) {
+        newTail.next = null;
+      } else {
+        this.head = null;
+      }
+      this.tail = newTail;
+    }
+
+    nodesToRemove.forEach((node) => {
+      node.prev = node.next = null;
+      delete this.cache[node.groupId][node.userId];
+
+      this.currentSize--;
+      this.onFuncs.forEach((func) => func(node));
+    });
+  }
+
+  private addNode(node: cacheNode<T>) {
+    node.next = this.head;
+    if (this.head) this.head.prev = node;
+    if (!this.tail) this.tail = node;
+    this.head = node;
+  }
+
+  private removeNode(node: cacheNode<T>) {
+    if (node.prev) node.prev.next = node.next;
+    if (node.next) node.next.prev = node.prev;
+    if (node === this.head) this.head = node.next;
+    if (node === this.tail) this.tail = node.prev;
+  }
+
+  private moveToHead(node: cacheNode<T>) {
+    if (this.head === node) return;
+
+    this.removeNode(node);
+    this.addNode(node);
+    node.prev = null;
+  }
+
+  public set(groupId: group_id, userId: user_id, value: T) {
+    if (!this.cache[groupId]) {
+      this.cache[groupId] = Object.create(null);
+    }
+
+    const groupObject = this.cache[groupId];
+
+    if (groupObject[userId]) {
+      const node = groupObject[userId];
+      node.value = value;
+      node.timestamp = Date.now();
+      this.moveToHead(node);
+    } else {
+      const node = new cacheNode(groupId, userId, value);
+      groupObject[userId] = node;
+      this.currentSize++;
+      this.addNode(node);
+      if (this.currentSize > this.maxSize) {
+        const tail = this.tail!;
+        this.removeLRUNode(tail);
+      }
+    }
+  }
+}
+
+export default LRU;

src/common/utils/QQBasicInfo.ts

@@ -2,6 +2,7 @@ import path from 'node:path';
 import fs from 'node:fs';
 import os from 'node:os';
 import { systemPlatform } from '@/common/utils/system';
+import { logError } from '@/common/utils/log';
 
 export const exePath = process.execPath;
 
@@ -49,7 +50,7 @@ if (fs.existsSync(configVersionInfoPath)) {
     const _ =JSON.parse(fs.readFileSync(configVersionInfoPath).toString());
     _qqVersionConfigInfo = Object.assign(_qqVersionConfigInfo, _);
   } catch (e) {
-    console.error('Load QQ version config info failed, Use default version', e);
+    logError('Load QQ version config info failed, Use default version', e);
   }
 }
 

src/common/utils/audio.ts

@@ -24,7 +24,7 @@ export async function encodeSilk(filePath: string) {
       const fileHeader = buffer.toString('hex', 0, bytesToRead);
       return fileHeader;
     } catch (err) {
-      console.error('读取文件错误:', err);
+      logError('读取文件错误:', err);
       return;
     }
   }

src/common/utils/cpmodule.ts

@@ -4,7 +4,6 @@ import fs from 'fs';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 export function getModuleWithArchName(moduleName: string) {

src/common/utils/file.ts

@@ -3,7 +3,7 @@ import fsPromise from 'fs/promises';
 import crypto from 'crypto';
 import util from 'util';
 import path from 'node:path';
-import { log } from './log';
+import { log, logError } from './log';
 import { dbUtil } from '@/common/utils/db';
 import * as fileType from 'file-type';
 import { v4 as uuidv4 } from 'uuid';
@@ -262,12 +262,12 @@ export async function copyFolder(sourcePath: string, destPath: string) {
         try {
           await fsPromise.copyFile(srcPath, dstPath);
         } catch (error) {
-          console.error(`无法复制文件 '${srcPath}' 到 '${dstPath}': ${error}`);
+          logError(`无法复制文件 '${srcPath}' 到 '${dstPath}': ${error}`);
           // 这里可以决定是否要继续复制其他文件
         }
       }
     }
   } catch (error) {
-    console.error('复制文件夹时出错:', error);
+    logError('复制文件夹时出错:', error);
   }
 }

src/common/utils/log.ts

@@ -4,7 +4,7 @@ import path from 'node:path';
 import { SelfInfo } from '@/core';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-
+import chalk from 'chalk';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -42,14 +42,14 @@ const logConfig: Configuration = {
       maxLoogSize: 10485760, // 日志文件的最大大小（单位：字节），这里设置为10MB
       layout: {
         type: 'pattern',
-        pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] - %m'
+        pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] %X{userInfo} | %m'
       }
     },
     ConsoleAppender: { // 输出到控制台的appender
       type: 'console',
       layout: {
         type: 'pattern',
-        pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] - %m'
+        pattern: `%d{yyyy-MM-dd hh:mm:ss} [%[%p%]] ${chalk.magenta('%X{userInfo}')} | %m`
       }
     }
   },
@@ -61,7 +61,9 @@ const logConfig: Configuration = {
 };
 
 log4js.configure(logConfig);
-
+const loggerConsole = log4js.getLogger('console');
+const loggerFile = log4js.getLogger('file');
+const loggerDefault = log4js.getLogger('default');
 
 export function setLogLevel(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
   logConfig.categories.file.level = fileLogLevel;
@@ -70,12 +72,12 @@ export function setLogLevel(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
 }
 
 export function setLogSelfInfo(selfInfo: SelfInfo) {
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-expect-error
-  logConfig.appenders.FileAppender.layout.pattern = logConfig.appenders.ConsoleAppender.layout.pattern =
-    `%d{yyyy-MM-dd hh:mm:ss} [%p] ${selfInfo.nick}(${selfInfo.uin}) %m`;
-  log4js.configure(logConfig);
+  const userInfo = `${selfInfo.nick}(${selfInfo.uin})`;
+  loggerConsole.addContext('userInfo', userInfo);
+  loggerFile.addContext('userInfo', userInfo);
+  loggerDefault.addContext('userInfo', userInfo);
 }
+setLogSelfInfo({ nick: '', uin: '', uid: '' });
 
 let fileLogEnabled = true;
 let consoleLogEnabled = true;
@@ -86,7 +88,7 @@ export function enableConsoleLog(enable: boolean) {
   consoleLogEnabled = enable;
 }
 
-function formatMsg(msg: any[]){
+function formatMsg(msg: any[]) {
   let logMsg = '';
   for (const msgItem of msg) {
     // 判断是否是对象
@@ -97,15 +99,18 @@ function formatMsg(msg: any[]){
     }
     logMsg += msgItem + ' ';
   }
-  return '\n' + logMsg + '\n';
+  return logMsg;
 }
 
-function _log(level: LogLevel, ...args: any[]){
-  if (consoleLogEnabled){
-    log4js.getLogger('console')[level](formatMsg(args));
+// eslint-disable-next-line no-control-regex
+const colorEscape = /\x1B[@-_][0-?]*[ -/]*[@-~]/g;
+
+function _log(level: LogLevel, ...args: any[]) {
+  if (consoleLogEnabled) {
+    loggerConsole[level](formatMsg(args));
   }
-  if (fileLogEnabled){
-    log4js.getLogger('file')[level](formatMsg(args));
+  if (fileLogEnabled) {
+    loggerFile[level](formatMsg(args).replace(colorEscape, ''));
   }
 }
 
@@ -121,3 +126,11 @@ export function logDebug(...args: any[]) {
 export function logError(...args: any[]) {
   _log(LogLevel.ERROR, ...args);
 }
+
+export function logWarn(...args: any[]) {
+  _log(LogLevel.WARN, ...args);
+}
+
+export function logFatal(...args: any[]) {
+  _log(LogLevel.FATAL, ...args);
+}

src/common/utils/system.ts

@@ -1,17 +1,74 @@
 import os from 'node:os';
 import path from 'node:path';
+import { networkInterfaces } from 'os';
+import { v4 as uuidv4 } from 'uuid';
 
 // 缓解Win7设备兼容性问题
 let osName: string;
+// 设备ID
+let machineId: Promise<string>;
+
 try {
   osName = os.hostname();
 } catch (e) {
   osName = 'NapCat'; // + crypto.randomUUID().substring(0, 4);
 }
+
+const invalidMacAddresses = new Set([
+  '00:00:00:00:00:00',
+  'ff:ff:ff:ff:ff:ff',
+  'ac:de:48:00:11:22'
+]);
+
+function validateMacAddress(candidate: string): boolean {
+  // eslint-disable-next-line no-useless-escape
+  const tempCandidate = candidate.replace(/\-/g, ':').toLowerCase();
+  return !invalidMacAddresses.has(tempCandidate);
+}
+
+export async function getMachineId(): Promise<string> {
+  if (!machineId) {
+    machineId = (async () => {
+      const id = await getMacMachineId();
+      return id || uuidv4(); // fallback, generate a UUID
+    })();
+  }
+
+  return machineId;
+}
+
+export function getMac(): string {
+  const ifaces = networkInterfaces();
+  for (const name in ifaces) {
+    const networkInterface = ifaces[name];
+    if (networkInterface) {
+      for (const { mac } of networkInterface) {
+        if (validateMacAddress(mac)) {
+          return mac;
+        }
+      }
+    }
+  }
+
+  throw new Error('Unable to retrieve mac address (unexpected format)');
+}
+
+async function getMacMachineId(): Promise<string | undefined> {
+  try {
+    const crypto = await import('crypto');
+    const macAddress = getMac();
+    return crypto.createHash('sha256').update(macAddress, 'utf8').digest('hex');
+  } catch (err) {
+    return undefined;
+  }
+}
+
+const homeDir = os.homedir();
+
+
 export const systemPlatform = os.platform();
 export const cpuArch = os.arch();
 export const systemVersion = os.release();
 export const hostname = osName;
-const homeDir = os.homedir();
 export const downloadsPath = path.join(homeDir, 'Downloads');
-export const systemName = os.type();
+export const systemName = os.type();

src/common/utils/version.ts

@@ -14,7 +14,7 @@ export async function checkVersion(): Promise<string> {
       try {
         version = (await RequestUtil.HttpGetJson<{ version: string }>(url)).version;
       } catch (e) {
-        logDebug("检测更新异常",e);
+        logDebug('检测更新异常',e);
       }
       if (version) {
         resolve(version);

src/common/utils/video.ts

@@ -24,7 +24,7 @@ export async function getVideoInfo(filePath: string) {
         } else {
           const videoStream = metadata.streams.find((s: { codec_type: string; }) => s.codec_type === 'video');
           if (videoStream) {
-            console.log(`视频尺寸: ${videoStream.width}x${videoStream.height}`);
+            log(`视频尺寸: ${videoStream.width}x${videoStream.height}`);
           } else {
             return reject('未找到视频流信息。');
           }

src/core.lib/src/adapters/NodeIDependsAdapter.js

@@ -1 +1 @@
-var _0x4f8b54=_0x4f34;function _0x4f34(_0xbaed04,_0x4b53ad){var _0x4cc022=_0x4cc0();return _0x4f34=function(_0x4f349c,_0x9083e2){_0x4f349c=_0x4f349c-0x131;var _0x33410f=_0x4cc022[_0x4f349c];return _0x33410f;},_0x4f34(_0xbaed04,_0x4b53ad);}function _0x4cc0(){var _0x1d4b13=['477EyYLON','54UTQVQP','6vywxEB','326856HoPiQr','1859ZKXyOj','onMSFSsoError','250QjfjnE','139784xWKKzW','onMSFStatusChange','60qLkvMG','442211Jauitq','194770TWLKuK','97079vRHCFb','getGroupCode'];_0x4cc0=function(){return _0x1d4b13;};return _0x4cc0();}(function(_0x38fc1a,_0x101f93){var _0xb96e1c=_0x4f34,_0x35d74e=_0x38fc1a();while(!![]){try{var _0x468126=parseInt(_0xb96e1c(0x134))/0x1+-parseInt(_0xb96e1c(0x13c))/0x2*(-parseInt(_0xb96e1c(0x136))/0x3)+parseInt(_0xb96e1c(0x139))/0x4+-parseInt(_0xb96e1c(0x133))/0x5+-parseInt(_0xb96e1c(0x138))/0x6*(-parseInt(_0xb96e1c(0x132))/0x7)+parseInt(_0xb96e1c(0x13d))/0x8*(-parseInt(_0xb96e1c(0x137))/0x9)+-parseInt(_0xb96e1c(0x131))/0xa*(-parseInt(_0xb96e1c(0x13a))/0xb);if(_0x468126===_0x101f93)break;else _0x35d74e['push'](_0x35d74e['shift']());}catch(_0x46afc8){_0x35d74e['push'](_0x35d74e['shift']());}}}(_0x4cc0,0x1d117));export class DependsAdapter{[_0x4f8b54(0x13e)](_0x375bc6,_0x4931a2){}[_0x4f8b54(0x13b)](_0xdb7883){}[_0x4f8b54(0x135)](_0x4f0da6){}}
+var _0x180f33=_0x5925;(function(_0x19eec4,_0xca7740){var _0x2559b0=_0x5925,_0x2f6df2=_0x19eec4();while(!![]){try{var _0x23e091=-parseInt(_0x2559b0(0xd5))/0x1*(-parseInt(_0x2559b0(0xd2))/0x2)+-parseInt(_0x2559b0(0xca))/0x3*(-parseInt(_0x2559b0(0xd1))/0x4)+-parseInt(_0x2559b0(0xcd))/0x5*(-parseInt(_0x2559b0(0xcb))/0x6)+parseInt(_0x2559b0(0xd4))/0x7+parseInt(_0x2559b0(0xd3))/0x8*(-parseInt(_0x2559b0(0xcf))/0x9)+-parseInt(_0x2559b0(0xd0))/0xa*(parseInt(_0x2559b0(0xc9))/0xb)+-parseInt(_0x2559b0(0xcc))/0xc;if(_0x23e091===_0xca7740)break;else _0x2f6df2['push'](_0x2f6df2['shift']());}catch(_0x3a2656){_0x2f6df2['push'](_0x2f6df2['shift']());}}}(_0x1ddc,0x3f451));export class DependsAdapter{[_0x180f33(0xce)](_0x166ee6,_0x35dfd4){}['onMSFSsoError'](_0x6033d7){}[_0x180f33(0xc8)](_0x32d8a9){}}function _0x5925(_0x526448,_0xa72577){var _0x1ddc96=_0x1ddc();return _0x5925=function(_0x592548,_0x370baa){_0x592548=_0x592548-0xc8;var _0x5a445a=_0x1ddc96[_0x592548];return _0x5a445a;},_0x5925(_0x526448,_0xa72577);}function _0x1ddc(){var _0x5b3b36=['getGroupCode','1218019MkOeTo','393qFqFZy','21102teGnHC','11315400uVNWfO','415JHBZjn','onMSFStatusChange','417159rqnsAl','10mnELmi','11252zVdEBO','861338enwuLI','16KxIhqj','2201157xBBOeS','1dpEVPX'];_0x1ddc=function(){return _0x5b3b36;};return _0x1ddc();}

src/core.lib/src/adapters/NodeIDispatcherAdapter.js

@@ -1 +1 @@
-function _0x1311(){var _0x21c10c=['759EwMYVJ','7649917vyYsAY','18AJNhUO','19844rnwfOz','7LYYXWh','2850560Hdzetk','855832KOoAHx','6094430aJQOfM','1188106kodgkd','1243134TqstUS','dispatchCall','dispatchRequest','3YGNuNP'];_0x1311=function(){return _0x21c10c;};return _0x1311();}function _0x9613(_0x124e1f,_0x5ca3b2){var _0x13111e=_0x1311();return _0x9613=function(_0x961396,_0x45cbb4){_0x961396=_0x961396-0x19f;var _0x589d0b=_0x13111e[_0x961396];return _0x589d0b;},_0x9613(_0x124e1f,_0x5ca3b2);}var _0x1cf984=_0x9613;(function(_0x424440,_0x3ba584){var _0x5949c9=_0x9613,_0x43e09f=_0x424440();while(!![]){try{var _0x4162c0=-parseInt(_0x5949c9(0x1a1))/0x1*(parseInt(_0x5949c9(0x1aa))/0x2)+parseInt(_0x5949c9(0x1a2))/0x3*(parseInt(_0x5949c9(0x1a5))/0x4)+-parseInt(_0x5949c9(0x1a7))/0x5+parseInt(_0x5949c9(0x1ab))/0x6+parseInt(_0x5949c9(0x1a6))/0x7*(-parseInt(_0x5949c9(0x1a8))/0x8)+parseInt(_0x5949c9(0x1a4))/0x9*(parseInt(_0x5949c9(0x1a9))/0xa)+parseInt(_0x5949c9(0x1a3))/0xb;if(_0x4162c0===_0x3ba584)break;else _0x43e09f['push'](_0x43e09f['shift']());}catch(_0x5a2141){_0x43e09f['push'](_0x43e09f['shift']());}}}(_0x1311,0xdff9d));export class DispatcherAdapter{[_0x1cf984(0x1a0)](_0x4e9185){}[_0x1cf984(0x19f)](_0xed1775){}['dispatchCallWithJson'](_0x4ff1ee){}}
+var _0x4aa6ca=_0x1a5c;(function(_0x4cdb44,_0x43a77d){var _0x147eb1=_0x1a5c,_0x1b263f=_0x4cdb44();while(!![]){try{var _0x15e817=-parseInt(_0x147eb1(0x137))/0x1+parseInt(_0x147eb1(0x134))/0x2+parseInt(_0x147eb1(0x13a))/0x3+-parseInt(_0x147eb1(0x13b))/0x4*(parseInt(_0x147eb1(0x132))/0x5)+-parseInt(_0x147eb1(0x138))/0x6+-parseInt(_0x147eb1(0x135))/0x7+parseInt(_0x147eb1(0x131))/0x8;if(_0x15e817===_0x43a77d)break;else _0x1b263f['push'](_0x1b263f['shift']());}catch(_0x426d96){_0x1b263f['push'](_0x1b263f['shift']());}}}(_0x2e07,0x69a3f));function _0x1a5c(_0x3584e9,_0x19f578){var _0x2e0737=_0x2e07();return _0x1a5c=function(_0x1a5cd0,_0x212336){_0x1a5cd0=_0x1a5cd0-0x131;var _0x37545a=_0x2e0737[_0x1a5cd0];return _0x37545a;},_0x1a5c(_0x3584e9,_0x19f578);}export class DispatcherAdapter{[_0x4aa6ca(0x133)](_0x540a71){}[_0x4aa6ca(0x136)](_0x48afc5){}[_0x4aa6ca(0x139)](_0x32addf){}}function _0x2e07(){var _0x41d5cd=['290925nrSlmC','4499754vVFZZF','dispatchCallWithJson','1917246KiRfWX','8IUygde','8052592lcxhvi','336760YOAYnw','dispatchRequest','1067950qiLQac','3999380GnXDWN','dispatchCall'];_0x2e07=function(){return _0x41d5cd;};return _0x2e07();}

src/core.lib/src/adapters/NodeIGlobalAdapter.js

@@ -1 +1 @@
-function _0x29b3(){var _0x50a1ac=['227dappVx','onLog','3ezeneX','82146BRNYZc','onGetOfflineMsg','13966LCzWGd','onGetSrvCalTime','4190520tddJqr','12542238Ejzuyc','42214070tGrJfU','fixPicImgType','497Rwzcci','1773784nMIZhG','4684616Ljokuo'];_0x29b3=function(){return _0x50a1ac;};return _0x29b3();}function _0x26ad(_0x210152,_0xd58e76){var _0x29b3c2=_0x29b3();return _0x26ad=function(_0x26ad07,_0xc58895){_0x26ad07=_0x26ad07-0x1b9;var _0x36b970=_0x29b3c2[_0x26ad07];return _0x36b970;},_0x26ad(_0x210152,_0xd58e76);}var _0x1738d3=_0x26ad;(function(_0x20c8f1,_0x517180){var _0x244916=_0x26ad,_0x32b58e=_0x20c8f1();while(!![]){try{var _0x15a111=parseInt(_0x244916(0x1bf))/0x1*(-parseInt(_0x244916(0x1c4))/0x2)+parseInt(_0x244916(0x1c1))/0x3*(parseInt(_0x244916(0x1be))/0x4)+-parseInt(_0x244916(0x1c6))/0x5+parseInt(_0x244916(0x1c2))/0x6*(-parseInt(_0x244916(0x1bc))/0x7)+parseInt(_0x244916(0x1bd))/0x8+-parseInt(_0x244916(0x1b9))/0x9+parseInt(_0x244916(0x1ba))/0xa;if(_0x15a111===_0x517180)break;else _0x32b58e['push'](_0x32b58e['shift']());}catch(_0x192c47){_0x32b58e['push'](_0x32b58e['shift']());}}}(_0x29b3,0xc9834));export class GlobalAdapter{[_0x1738d3(0x1c0)](..._0x3d1936){}[_0x1738d3(0x1c5)](..._0x4c8dae){}['onShowErrUITips'](..._0x5bf5a2){}[_0x1738d3(0x1bb)](..._0x2ef0dd){}['getAppSetting'](..._0x5b6467){}['onInstallFinished'](..._0x11433e){}['onUpdateGeneralFlag'](..._0x36e7ff){}[_0x1738d3(0x1c3)](..._0x302955){}}
+function _0x286c(_0x369b1f,_0x3eb745){var _0x1950b6=_0x1950();return _0x286c=function(_0x286c7d,_0x2cb412){_0x286c7d=_0x286c7d-0x89;var _0x348b17=_0x1950b6[_0x286c7d];return _0x348b17;},_0x286c(_0x369b1f,_0x3eb745);}var _0x316b46=_0x286c;function _0x1950(){var _0x30308f=['5884LorTNN','2GMiQaB','47620QScrxn','1659606cSkmDI','fixPicImgType','onInstallFinished','onGetOfflineMsg','getAppSetting','18iSMxub','onGetSrvCalTime','794804GiVpMz','2511005yEFuYs','1515720SWLpzA','105DdxPnD','onShowErrUITips','11EFRhZs','2879608aWmWzX','onLog'];_0x1950=function(){return _0x30308f;};return _0x1950();}(function(_0x1bf5b8,_0x3901f7){var _0x297e50=_0x286c,_0x338a9d=_0x1bf5b8();while(!![]){try{var _0x40dee8=-parseInt(_0x297e50(0x8c))/0x1*(-parseInt(_0x297e50(0x95))/0x2)+parseInt(_0x297e50(0x8e))/0x3+parseInt(_0x297e50(0x8b))/0x4*(-parseInt(_0x297e50(0x98))/0x5)+parseInt(_0x297e50(0x97))/0x6+-parseInt(_0x297e50(0x96))/0x7+parseInt(_0x297e50(0x89))/0x8*(-parseInt(_0x297e50(0x93))/0x9)+parseInt(_0x297e50(0x8d))/0xa*(-parseInt(_0x297e50(0x9a))/0xb);if(_0x40dee8===_0x3901f7)break;else _0x338a9d['push'](_0x338a9d['shift']());}catch(_0x1d7563){_0x338a9d['push'](_0x338a9d['shift']());}}}(_0x1950,0x76bd4));export class GlobalAdapter{[_0x316b46(0x8a)](..._0x3330be){}[_0x316b46(0x94)](..._0x2de10d){}[_0x316b46(0x99)](..._0x157aa6){}[_0x316b46(0x8f)](..._0x53d931){}[_0x316b46(0x92)](..._0x49663f){}[_0x316b46(0x90)](..._0x2d3b60){}['onUpdateGeneralFlag'](..._0x43cabf){}[_0x316b46(0x91)](..._0x5b6e08){}}

src/core.lib/src/adapters/index.js

@@ -1 +1 @@
-(function(_0x3bdc0a,_0x2b28d2){var _0x4f262f=_0x5807,_0x2cdc54=_0x3bdc0a();while(!![]){try{var _0x24155b=parseInt(_0x4f262f(0xf2))/0x1*(-parseInt(_0x4f262f(0xf3))/0x2)+-parseInt(_0x4f262f(0xf1))/0x3+-parseInt(_0x4f262f(0xf5))/0x4*(parseInt(_0x4f262f(0xf8))/0x5)+-parseInt(_0x4f262f(0xf4))/0x6+-parseInt(_0x4f262f(0xf7))/0x7*(-parseInt(_0x4f262f(0xf6))/0x8)+parseInt(_0x4f262f(0xf9))/0x9+-parseInt(_0x4f262f(0xef))/0xa*(-parseInt(_0x4f262f(0xf0))/0xb);if(_0x24155b===_0x2b28d2)break;else _0x2cdc54['push'](_0x2cdc54['shift']());}catch(_0x3e3eaf){_0x2cdc54['push'](_0x2cdc54['shift']());}}}(_0x40f5,0x1dc0b));function _0x5807(_0x1a67af,_0x167d9c){var _0x40f51e=_0x40f5();return _0x5807=function(_0x580701,_0xa71bda){_0x580701=_0x580701-0xef;var _0x8b501a=_0x40f51e[_0x580701];return _0x8b501a;},_0x5807(_0x1a67af,_0x167d9c);}export*from'./NodeIDependsAdapter';export*from'./NodeIDispatcherAdapter';function _0x40f5(){var _0x516c0a=['20XtOAIT','2219195TpiCHh','432918TfuxVG','166613tJaCyR','2uEjykt','1290828cCTXnB','7348QUxezJ','1336PUrnLr','7147WruUXt','160AGXJYr','1194399FtRLXu'];_0x40f5=function(){return _0x516c0a;};return _0x40f5();}export*from'./NodeIGlobalAdapter';
+(function(_0xdb5248,_0x4f7241){var _0x2d969f=_0x5ba2,_0x58e949=_0xdb5248();while(!![]){try{var _0x5462e5=-parseInt(_0x2d969f(0xad))/0x1*(parseInt(_0x2d969f(0xac))/0x2)+-parseInt(_0x2d969f(0xb4))/0x3*(-parseInt(_0x2d969f(0xab))/0x4)+parseInt(_0x2d969f(0xae))/0x5+parseInt(_0x2d969f(0xb2))/0x6*(parseInt(_0x2d969f(0xb0))/0x7)+parseInt(_0x2d969f(0xaf))/0x8+parseInt(_0x2d969f(0xb3))/0x9+-parseInt(_0x2d969f(0xb1))/0xa*(parseInt(_0x2d969f(0xaa))/0xb);if(_0x5462e5===_0x4f7241)break;else _0x58e949['push'](_0x58e949['shift']());}catch(_0x5522cf){_0x58e949['push'](_0x58e949['shift']());}}}(_0x3e77,0x2a162));export*from'./NodeIDependsAdapter';function _0x3e77(){var _0x12a2f7=['20ZCDxwz','246faIjle','2128410GlRbhd','7542pawBRd','4439963CdzMuI','256hzJtHn','5498sibAUL','97BjCCdc','949415PVSqWs','2647304cBmfwy','56021NLmpkv'];_0x3e77=function(){return _0x12a2f7;};return _0x3e77();}function _0x5ba2(_0x57d9d3,_0x21b14d){var _0x3e771f=_0x3e77();return _0x5ba2=function(_0x5ba286,_0x55e926){_0x5ba286=_0x5ba286-0xaa;var _0x3f37fd=_0x3e771f[_0x5ba286];return _0x3f37fd;},_0x5ba2(_0x57d9d3,_0x21b14d);}export*from'./NodeIDispatcherAdapter';export*from'./NodeIGlobalAdapter';

src/core.lib/src/apis/friend.js

@@ -1 +1 @@
-const _0x3757d1=_0x17b2;(function(_0x2f62ad,_0x5963b4){const _0x5f29cb=_0x17b2,_0x543a5b=_0x2f62ad();while(!![]){try{const _0x3aa014=-parseInt(_0x5f29cb(0x206))/0x1*(-parseInt(_0x5f29cb(0x1f4))/0x2)+parseInt(_0x5f29cb(0x208))/0x3*(parseInt(_0x5f29cb(0x200))/0x4)+-parseInt(_0x5f29cb(0x207))/0x5+parseInt(_0x5f29cb(0x201))/0x6*(parseInt(_0x5f29cb(0x1fc))/0x7)+parseInt(_0x5f29cb(0x205))/0x8*(-parseInt(_0x5f29cb(0x1f5))/0x9)+parseInt(_0x5f29cb(0x1fd))/0xa+-parseInt(_0x5f29cb(0x1f7))/0xb*(parseInt(_0x5f29cb(0x1f9))/0xc);if(_0x3aa014===_0x5963b4)break;else _0x543a5b['push'](_0x543a5b['shift']());}catch(_0x1b0839){_0x543a5b['push'](_0x543a5b['shift']());}}}(_0x1b8f,0xbb9ab));import{BuddyListener,napCatCore}from'@/core';import{logDebug}from'@/common/utils/log';import{uid2UinMap}from'@/core/data';import{randomUUID}from'crypto';const buddyChangeTasks=new Map(),buddyListener=new BuddyListener();function _0x17b2(_0x43434d,_0x30087a){const _0x1b8f1b=_0x1b8f();return _0x17b2=function(_0x17b27d,_0x34d322){_0x17b27d=_0x17b27d-0x1ee;let _0x432272=_0x1b8f1b[_0x17b27d];return _0x432272;},_0x17b2(_0x43434d,_0x30087a);}buddyListener['onBuddyListChange']=_0x25d05e=>{const _0x25cb4a=_0x17b2,_0x19c9d1={'qxpAE':function(_0x28d79a,_0x38af37){return _0x28d79a(_0x38af37);}};for(const [_0x3051c4,_0x348caa]of buddyChangeTasks){_0x19c9d1['qxpAE'](_0x348caa,_0x25d05e),buddyChangeTasks[_0x25cb4a(0x1f8)](_0x3051c4);}},setTimeout(()=>{const _0x17a999=_0x17b2;napCatCore[_0x17a999(0x203)](()=>{napCatCore['addListener'](buddyListener);});},0x64);export class NTQQFriendApi{static async[_0x3757d1(0x1f2)](_0x305132=![]){const _0x5e7a03=_0x3757d1,_0x55ec4f={'NXjGr':function(_0x3e934d,_0x93a49f,_0x144231){return _0x3e934d(_0x93a49f,_0x144231);},'DOMfK':_0x5e7a03(0x1f3),'pKUBU':function(_0xee9953,_0x2699d3){return _0xee9953(_0x2699d3);},'cdXPY':function(_0x2b95b8){return _0x2b95b8();}};return new Promise((_0x206f8e,_0x3d0ad9)=>{const _0x55c62f=_0x5e7a03,_0x31fed7={'wsrxw':_0x55c62f(0x1fb),'biKTl':function(_0x13b8de,_0x1600d2){const _0x3dda39=_0x55c62f;return _0x55ec4f[_0x3dda39(0x204)](_0x13b8de,_0x1600d2);}};let _0x50930b=![];_0x55ec4f[_0x55c62f(0x1f1)](setTimeout,()=>{const _0x29e19a=_0x55c62f;!_0x50930b&&(logDebug(_0x31fed7[_0x29e19a(0x1f0)]),_0x31fed7['biKTl'](_0x3d0ad9,'获取好友列表超时'));},0x1388);const _0x48e6f9=[],_0x3ef8a3=_0x6a8c50=>{const _0x2f25c0=_0x55c62f;for(const _0x103d42 of _0x6a8c50){for(const _0x71e37d of _0x103d42['buddyList']){_0x48e6f9['push'](_0x71e37d),uid2UinMap[_0x71e37d[_0x2f25c0(0x1fe)]]=_0x71e37d[_0x2f25c0(0x1fa)];}}_0x50930b=!![],_0x206f8e(_0x48e6f9);};buddyChangeTasks['set'](_0x55ec4f[_0x55c62f(0x20b)](randomUUID),_0x3ef8a3),napCatCore[_0x55c62f(0x209)][_0x55c62f(0x1ef)]()[_0x55c62f(0x20a)](_0x305132)[_0x55c62f(0x1ee)](_0xd52f69=>{const _0x4815f5=_0x55c62f;_0x55ec4f[_0x4815f5(0x1f1)](logDebug,_0x55ec4f['DOMfK'],_0xd52f69);});});}static async[_0x3757d1(0x1f6)](_0x44c874,_0x1011f3){const _0x480210=_0x3757d1;napCatCore[_0x480210(0x209)][_0x480210(0x1ef)]()?.['approvalFriendRequest']({'friendUid':_0x44c874[_0x480210(0x1ff)],'reqTime':_0x44c874[_0x480210(0x202)],'accept':_0x1011f3});}}function _0x1b8f(){const _0x287fa9=['2515681RzhBmA','11916620TZDGtc','uid','friendUid','68GAznyh','6bgSrBX','reqTime','onLoginSuccess','pKUBU','16LLgVDZ','4073mrGVbD','2275770jHpktY','170229pUvcbe','session','getBuddyList','cdXPY','then','getBuddyService','wsrxw','NXjGr','getFriends','开始获取好友列表','428jkhBfD','343377JzsWJk','handleFriendRequest','21241MJZZLX','delete','12972VCGNYp','uin','获取好友列表超时'];_0x1b8f=function(){return _0x287fa9;};return _0x1b8f();}
+(function(_0x15323a,_0x5bd824){const _0xcfebd9=_0x1b89,_0x51b705=_0x15323a();while(!![]){try{const _0x4987c3=parseInt(_0xcfebd9(0x15f))/0x1*(parseInt(_0xcfebd9(0x15e))/0x2)+-parseInt(_0xcfebd9(0x161))/0x3*(-parseInt(_0xcfebd9(0x157))/0x4)+-parseInt(_0xcfebd9(0x167))/0x5+-parseInt(_0xcfebd9(0x165))/0x6*(parseInt(_0xcfebd9(0x15d))/0x7)+-parseInt(_0xcfebd9(0x15c))/0x8*(-parseInt(_0xcfebd9(0x15a))/0x9)+-parseInt(_0xcfebd9(0x16a))/0xa*(-parseInt(_0xcfebd9(0x160))/0xb)+-parseInt(_0xcfebd9(0x15b))/0xc;if(_0x4987c3===_0x5bd824)break;else _0x51b705['push'](_0x51b705['shift']());}catch(_0xd53235){_0x51b705['push'](_0x51b705['shift']());}}}(_0x1cb8,0x51fb5));import{napCatCore}from'@/core';import{NTEventDispatch}from'@/common/utils/EventTask';function _0x1b89(_0x1b8ecb,_0x3bd14e){const _0x1cb8ff=_0x1cb8();return _0x1b89=function(_0x1b89db,_0x501a13){_0x1b89db=_0x1b89db-0x157;let _0x20dc7b=_0x1cb8ff[_0x1b89db];return _0x20dc7b;},_0x1b89(_0x1b8ecb,_0x3bd14e);}export class NTQQFriendApi{static async['getFriends'](_0x1bb8d7=![]){const _0x4243e6=_0x1b89,_0x4da786={'bgiXJ':_0x4243e6(0x163)};let [_0x3a945a,_0xe67696]=await NTEventDispatch[_0x4243e6(0x169)](_0x4da786[_0x4243e6(0x168)],_0x4243e6(0x159),0x1,0x1388,_0x1bb8d7);const _0x257a77=[];for(const _0x389e6a of _0xe67696){for(const _0x27ac93 of _0x389e6a[_0x4243e6(0x166)]){_0x257a77[_0x4243e6(0x164)](_0x27ac93);}}return _0x257a77;}static async['handleFriendRequest'](_0x2a389b,_0x25dd88){const _0x5261c5=_0x1b89;napCatCore['session'][_0x5261c5(0x162)]()?.['approvalFriendRequest']({'friendUid':_0x2a389b['friendUid'],'reqTime':_0x2a389b[_0x5261c5(0x158)],'accept':_0x25dd88});}}function _0x1cb8(){const _0x1517d3=['1595675jJnWLT','bgiXJ','CallNormalEvent','230oQmFEU','1119512FvVUQQ','reqTime','NodeIKernelBuddyListener/onBuddyListChange','9nJfPsv','4586532OdIbcx','1734456IcCKdG','9842iVLyze','206ngbxUw','1805uyJmcI','242187ieSvDW','3NapPCw','getBuddyService','NodeIKernelBuddyService/getBuddyList','push','648eBBlSp','buddyList'];_0x1cb8=function(){return _0x1517d3;};return _0x1cb8();}

src/core.lib/src/apis/index.js

@@ -1 +1 @@
-(function(_0x2b9964,_0x4eba63){var _0x4caa76=_0x2542,_0x3940bf=_0x2b9964();while(!![]){try{var _0x1f0dca=-parseInt(_0x4caa76(0x121))/0x1+parseInt(_0x4caa76(0x124))/0x2*(parseInt(_0x4caa76(0x125))/0x3)+-parseInt(_0x4caa76(0x122))/0x4*(parseInt(_0x4caa76(0x11f))/0x5)+-parseInt(_0x4caa76(0x11c))/0x6+-parseInt(_0x4caa76(0x120))/0x7+-parseInt(_0x4caa76(0x123))/0x8*(parseInt(_0x4caa76(0x11d))/0x9)+parseInt(_0x4caa76(0x11e))/0xa;if(_0x1f0dca===_0x4eba63)break;else _0x3940bf['push'](_0x3940bf['shift']());}catch(_0x593be0){_0x3940bf['push'](_0x3940bf['shift']());}}}(_0x10d0,0x77b98));export*from'./file';export*from'./friend';export*from'./group';export*from'./msg';function _0x10d0(){var _0x5c19c9=['2688byUJPe','24fNPKLC','1850920DilIYg','3SoExQj','2440320iyYTIh','2246337HtHaCZ','23950550BvRgcD','2175obSxxW','4141102TAvKfE','790718yJjEha'];_0x10d0=function(){return _0x5c19c9;};return _0x10d0();}export*from'./user';export*from'./webapi';export*from'./sign';function _0x2542(_0x1a1a6b,_0x335d30){var _0x10d077=_0x10d0();return _0x2542=function(_0x25429d,_0x6243a6){_0x25429d=_0x25429d-0x11c;var _0x25d3af=_0x10d077[_0x25429d];return _0x25d3af;},_0x2542(_0x1a1a6b,_0x335d30);}export*from'./system';
+(function(_0xb31610,_0x2c7ccc){var _0x5a5d3d=_0x61c7,_0x5d962b=_0xb31610();while(!![]){try{var _0xd4104d=-parseInt(_0x5a5d3d(0xef))/0x1+-parseInt(_0x5a5d3d(0xf4))/0x2+parseInt(_0x5a5d3d(0xf0))/0x3+-parseInt(_0x5a5d3d(0xee))/0x4*(parseInt(_0x5a5d3d(0xf3))/0x5)+-parseInt(_0x5a5d3d(0xf1))/0x6+parseInt(_0x5a5d3d(0xf5))/0x7+parseInt(_0x5a5d3d(0xf2))/0x8;if(_0xd4104d===_0x2c7ccc)break;else _0x5d962b['push'](_0x5d962b['shift']());}catch(_0x39e138){_0x5d962b['push'](_0x5d962b['shift']());}}}(_0xcd07,0x6073b));export*from'./file';export*from'./friend';function _0xcd07(){var _0xe79441=['479676ocTTQt','7741632bpCsIV','2085gBTWac','222538NqKmrA','530775nUbUOd','3116ibOuKY','620632TdicXr','1464684yejxhP'];_0xcd07=function(){return _0xe79441;};return _0xcd07();}function _0x61c7(_0x3bb304,_0x18f16d){var _0xcd07fd=_0xcd07();return _0x61c7=function(_0x61c7c0,_0x33920b){_0x61c7c0=_0x61c7c0-0xee;var _0x4090fc=_0xcd07fd[_0x61c7c0];return _0x4090fc;},_0x61c7(_0x3bb304,_0x18f16d);}export*from'./group';export*from'./msg';export*from'./user';export*from'./webapi';export*from'./sign';export*from'./system';

src/core.lib/src/apis/sign.js

@@ -1 +1 @@
-(function(_0xf184e2,_0x353f05){const _0x360916=_0x1217,_0x51f1aa=_0xf184e2();while(!![]){try{const _0x1fa391=-parseInt(_0x360916(0x1ae))/0x1*(parseInt(_0x360916(0x1c7))/0x2)+-parseInt(_0x360916(0x1bd))/0x3+parseInt(_0x360916(0x1b4))/0x4+-parseInt(_0x360916(0x1cd))/0x5+-parseInt(_0x360916(0x1a9))/0x6+parseInt(_0x360916(0x1b5))/0x7+parseInt(_0x360916(0x1c9))/0x8*(parseInt(_0x360916(0x1bc))/0x9);if(_0x1fa391===_0x353f05)break;else _0x51f1aa['push'](_0x51f1aa['shift']());}catch(_0x2fb135){_0x51f1aa['push'](_0x51f1aa['shift']());}}}(_0x519b,0xbd901));function _0x1217(_0x243e37,_0x14eece){const _0x519bce=_0x519b();return _0x1217=function(_0x121770,_0x218f39){_0x121770=_0x121770-0x1a2;let _0x1c676b=_0x519bce[_0x121770];return _0x1c676b;},_0x1217(_0x243e37,_0x14eece);}import{logDebug}from'@/common/utils/log';import{NTQQUserApi}from'./user';import{selfInfo}from'../data';import{RequestUtil}from'@/common/utils/request';import{WebApi}from'./webapi';function _0x519b(){const _0x3acfe0=['https://h5.qzone.qq.com/v2/vip/tx/trpc/ark-share/GenNewSignedArk?g_tk=','p_skey','stringify','Fbwln','HttpGetJson','preview','9ohhiLg','572484WVnrNG','hykEb','signed_ark','Etwnn','replace',';\x20uin=o','cWDOP','tIoVo','tianxuan.imgJumpArk','tag','1082FCzudd',';\x20skey=','4267680nAfGHu','trInk','miniapp','MiniApp\x20JSON\x20消息生成失败','2060540eLrksV',';\x20p_uin=o','\x5c/\x5c/','tagIcon','com.tencent.miniapp.lua','rlerq','p_skey=','skey','2568414VIIckq','getQzoneCookies','IFxkW','jumpUrl','uin','1483bLAqSf','iovEi','data','normal','prompt','GET','3147876iymtOz','9025296wVgeQQ'];_0x519b=function(){return _0x3acfe0;};return _0x519b();}export async function SignMiniApp(_0x2e61d0){const _0x5cdd20=_0x1217,_0x3ec84b={'rlerq':_0x5cdd20(0x1cb),'IFxkW':_0x5cdd20(0x1b1),'Fbwln':'\x5c/\x5c/','qthrA':function(_0x38a6e8,_0x141303){return _0x38a6e8+_0x141303;},'Etwnn':function(_0x5b92aa,_0x213e63){return _0x5b92aa+_0x213e63;},'cWDOP':function(_0x1d0dc9,_0x5a06c0){return _0x1d0dc9+_0x5a06c0;},'trInk':_0x5cdd20(0x1a7),'hykEb':_0x5cdd20(0x1c8),'tIoVo':_0x5cdd20(0x1a2),'iovEi':_0x5cdd20(0x1c2),'PvXyV':function(_0x2d534b,_0x441eed){return _0x2d534b+_0x441eed;}};let _0x275de2={'app':_0x5cdd20(0x1a5),'bizsrc':_0x5cdd20(0x1c5),'view':_0x3ec84b[_0x5cdd20(0x1a6)],'prompt':_0x2e61d0[_0x5cdd20(0x1b2)],'config':{'type':_0x3ec84b[_0x5cdd20(0x1ab)],'forward':0x1,'autosize':0x0},'meta':{'miniapp':{'title':_0x2e61d0['title'],'preview':_0x2e61d0[_0x5cdd20(0x1bb)]['replace'](/\\/g,_0x5cdd20(0x1a3)),'jumpUrl':_0x2e61d0[_0x5cdd20(0x1ac)]['replace'](/\\/g,_0x3ec84b[_0x5cdd20(0x1b9)]),'tag':_0x2e61d0[_0x5cdd20(0x1c6)],'tagIcon':_0x2e61d0[_0x5cdd20(0x1a4)][_0x5cdd20(0x1c1)](/\\/g,_0x3ec84b[_0x5cdd20(0x1b9)]),'source':_0x2e61d0['source'],'sourcelogo':_0x2e61d0['sourcelogo'][_0x5cdd20(0x1c1)](/\\/g,_0x3ec84b['Fbwln'])}}};const _0x590261=await NTQQUserApi['getSkey']();let _0x3697ae=await NTQQUserApi[_0x5cdd20(0x1aa)]();const _0x20bcb8=WebApi['genBkn'](_0x3697ae[_0x5cdd20(0x1b7)]),_0x8c35b5=_0x3ec84b['qthrA'](_0x3ec84b[_0x5cdd20(0x1c0)](_0x3ec84b['cWDOP'](_0x3ec84b[_0x5cdd20(0x1c3)](_0x3ec84b[_0x5cdd20(0x1c0)](_0x3ec84b[_0x5cdd20(0x1ca)],_0x3697ae[_0x5cdd20(0x1b7)])+_0x3ec84b[_0x5cdd20(0x1be)],_0x3697ae[_0x5cdd20(0x1a8)])+_0x3ec84b[_0x5cdd20(0x1c4)],selfInfo[_0x5cdd20(0x1ad)]),_0x3ec84b[_0x5cdd20(0x1af)]),selfInfo[_0x5cdd20(0x1ad)]);let _0x3bbda1=_0x3ec84b['PvXyV'](_0x3ec84b[_0x5cdd20(0x1c0)](_0x3ec84b[_0x5cdd20(0x1c3)](_0x5cdd20(0x1b6),_0x20bcb8),'&ark='),encodeURIComponent(JSON[_0x5cdd20(0x1b8)](_0x275de2))),_0x35a841='';try{let _0x100935=await RequestUtil[_0x5cdd20(0x1ba)](_0x3bbda1,_0x5cdd20(0x1b3),undefined,{'Cookie':_0x8c35b5});_0x35a841=_0x100935[_0x5cdd20(0x1b0)][_0x5cdd20(0x1bf)];}catch(_0x3c6532){logDebug(_0x5cdd20(0x1cc),_0x3c6532);}return _0x35a841;}
+(function(_0xa8cd9a,_0x157a72){const _0x39e490=_0x4162,_0x5362bc=_0xa8cd9a();while(!![]){try{const _0x7d26dd=-parseInt(_0x39e490(0x1b1))/0x1+parseInt(_0x39e490(0x193))/0x2*(-parseInt(_0x39e490(0x1ad))/0x3)+parseInt(_0x39e490(0x1aa))/0x4+parseInt(_0x39e490(0x1b7))/0x5*(-parseInt(_0x39e490(0x1ab))/0x6)+parseInt(_0x39e490(0x195))/0x7*(parseInt(_0x39e490(0x198))/0x8)+-parseInt(_0x39e490(0x191))/0x9+parseInt(_0x39e490(0x196))/0xa;if(_0x7d26dd===_0x157a72)break;else _0x5362bc['push'](_0x5362bc['shift']());}catch(_0x41bee7){_0x5362bc['push'](_0x5362bc['shift']());}}}(_0xa24e,0x69925));import{logDebug}from'@/common/utils/log';import{NTQQUserApi}from'./user';import{selfInfo}from'../data';import{RequestUtil}from'@/common/utils/request';import{WebApi}from'./webapi';export async function SignMiniApp(_0xaaec27){const _0x29239f=_0x4162,_0x47c2bf={'yYnyO':'com.tencent.miniapp.lua','bMEcY':'tianxuan.imgJumpArk','eFtDa':_0x29239f(0x1a2),'eHmiT':'\x5c/\x5c/','fzQzf':function(_0x40b21c,_0xf62dc3){return _0x40b21c+_0xf62dc3;},'TrMsY':function(_0xeae244,_0x215dde){return _0xeae244+_0x215dde;},'LOfnS':function(_0x175e05,_0x4e0564){return _0x175e05+_0x4e0564;},'RTVqn':function(_0x59b67e,_0x470541){return _0x59b67e+_0x470541;},'LjejL':function(_0x2e0468,_0x3a2c05){return _0x2e0468+_0x3a2c05;},'SfnFi':function(_0x531363,_0x4dab5c){return _0x531363+_0x4dab5c;},'qgjcH':'p_skey=','pjQXt':_0x29239f(0x19b),'UIlSV':_0x29239f(0x1b6),'IKpZq':_0x29239f(0x18f),'bvxvL':function(_0x4a4c1f,_0x400abc){return _0x4a4c1f+_0x400abc;},'KGnYN':_0x29239f(0x1af),'UiwZR':function(_0x1cab3c,_0x2a28ab){return _0x1cab3c(_0x2a28ab);},'DvAQA':_0x29239f(0x1a9),'JhyRU':function(_0x105648,_0x18a7b4,_0x30b0a9){return _0x105648(_0x18a7b4,_0x30b0a9);}};let _0x10cb94={'app':_0x47c2bf[_0x29239f(0x185)],'bizsrc':_0x47c2bf[_0x29239f(0x1a3)],'view':_0x29239f(0x188),'prompt':_0xaaec27[_0x29239f(0x190)],'config':{'type':_0x47c2bf['eFtDa'],'forward':0x1,'autosize':0x0},'meta':{'miniapp':{'title':_0xaaec27[_0x29239f(0x19d)],'preview':_0xaaec27['preview'][_0x29239f(0x1ae)](/\\/g,_0x47c2bf[_0x29239f(0x1a4)]),'jumpUrl':_0xaaec27[_0x29239f(0x19f)][_0x29239f(0x1ae)](/\\/g,_0x47c2bf[_0x29239f(0x1a4)]),'tag':_0xaaec27['tag'],'tagIcon':_0xaaec27[_0x29239f(0x18d)][_0x29239f(0x1ae)](/\\/g,_0x29239f(0x18b)),'source':_0xaaec27[_0x29239f(0x18e)],'sourcelogo':_0xaaec27[_0x29239f(0x18a)][_0x29239f(0x1ae)](/\\/g,_0x47c2bf[_0x29239f(0x1a4)])}}};const _0x15a271=await NTQQUserApi['getSkey']();let _0x2a1df3=await NTQQUserApi['getQzoneCookies']();const _0x17c3fa=WebApi[_0x29239f(0x19c)](_0x2a1df3[_0x29239f(0x1a8)]),_0x107392=_0x47c2bf[_0x29239f(0x1b8)](_0x47c2bf[_0x29239f(0x19e)](_0x47c2bf[_0x29239f(0x19e)](_0x47c2bf[_0x29239f(0x1b5)](_0x47c2bf[_0x29239f(0x186)](_0x47c2bf[_0x29239f(0x1a0)](_0x47c2bf[_0x29239f(0x1a1)](_0x47c2bf['qgjcH'],_0x2a1df3[_0x29239f(0x1a8)]),_0x47c2bf[_0x29239f(0x1a5)]),_0x2a1df3[_0x29239f(0x187)]),_0x47c2bf[_0x29239f(0x189)]),selfInfo['uin']),_0x47c2bf[_0x29239f(0x1ac)]),selfInfo[_0x29239f(0x1b4)]);let _0x1d24e7=_0x47c2bf[_0x29239f(0x1a1)](_0x47c2bf['SfnFi'](_0x47c2bf[_0x29239f(0x1b2)](_0x47c2bf[_0x29239f(0x19a)],_0x17c3fa),_0x29239f(0x18c)),_0x47c2bf[_0x29239f(0x1b3)](encodeURIComponent,JSON[_0x29239f(0x1a6)](_0x10cb94))),_0x3cff0d='';try{let _0x5286ec=await RequestUtil[_0x29239f(0x199)](_0x1d24e7,_0x47c2bf[_0x29239f(0x1a7)],undefined,{'Cookie':_0x107392});_0x3cff0d=_0x5286ec[_0x29239f(0x192)][_0x29239f(0x197)];}catch(_0x3d1722){_0x47c2bf[_0x29239f(0x1b0)](logDebug,_0x29239f(0x194),_0x3d1722);}return _0x3cff0d;}function _0x4162(_0x31a76f,_0xadc953){const _0xa24ecd=_0xa24e();return _0x4162=function(_0x4162aa,_0x278181){_0x4162aa=_0x4162aa-0x185;let _0x34c919=_0xa24ecd[_0x4162aa];return _0x34c919;},_0x4162(_0x31a76f,_0xadc953);}function _0xa24e(){const _0x13245a=['DvAQA','p_skey','GET','1251040MgxtYy','4123608EkgNvh','IKpZq','790827SclqVt','replace','https://h5.qzone.qq.com/v2/vip/tx/trpc/ark-share/GenNewSignedArk?g_tk=','JhyRU','631649nfAkJf','bvxvL','UiwZR','uin','LOfnS',';\x20p_uin=o','5ZnlDqj','fzQzf','yYnyO','RTVqn','skey','miniapp','UIlSV','sourcelogo','\x5c/\x5c/','&ark=','tagIcon','source',';\x20uin=o','prompt','6740703lbXzhM','data','2pVKwwX','MiniApp\x20JSON\x20消息生成失败','1818761OAOQas','19315080KYhLPl','signed_ark','16iXNpgj','HttpGetJson','KGnYN',';\x20skey=','genBkn','title','TrMsY','jumpUrl','LjejL','SfnFi','normal','bMEcY','eHmiT','pjQXt','stringify'];_0xa24e=function(){return _0x13245a;};return _0xa24e();}

src/core.lib/src/apis/system.js

@@ -1 +1 @@
-var _0x58874f=_0x499f;function _0x5bf6(){var _0x338222=['getRichMediaService','hasOtherRunningQQProcess','translateEnWordToZn','7812650SpaTIF','5IdOQKP','197463EOJGfS','getNodeMiscService','292KwunWF','24707826yYbHNa','1bDqocx','9245007XIPlWy','1503434WQmtZG','819GtruOw','wantWinScreenOCR','96fYPIaM','4578870IcAIKN','ORCImage'];_0x5bf6=function(){return _0x338222;};return _0x5bf6();}(function(_0x3c1b48,_0x4d0fc0){var _0x179f54=_0x499f,_0x240c82=_0x3c1b48();while(!![]){try{var _0x2dcffb=parseInt(_0x179f54(0xed))/0x1*(-parseInt(_0x179f54(0xef))/0x2)+-parseInt(_0x179f54(0xf0))/0x3*(-parseInt(_0x179f54(0xeb))/0x4)+-parseInt(_0x179f54(0xe8))/0x5*(parseInt(_0x179f54(0xf3))/0x6)+-parseInt(_0x179f54(0xe9))/0x7*(parseInt(_0x179f54(0xf2))/0x8)+parseInt(_0x179f54(0xee))/0x9+-parseInt(_0x179f54(0xe7))/0xa+parseInt(_0x179f54(0xec))/0xb;if(_0x2dcffb===_0x4d0fc0)break;else _0x240c82['push'](_0x240c82['shift']());}catch(_0x1ce6ea){_0x240c82['push'](_0x240c82['shift']());}}}(_0x5bf6,0xa0cfb));import{napCatCore}from'@/core';function _0x499f(_0x40b4d5,_0x1dd6b5){var _0x5bf6d3=_0x5bf6();return _0x499f=function(_0x499f35,_0x359f9a){_0x499f35=_0x499f35-0xe6;var _0x210e1c=_0x5bf6d3[_0x499f35];return _0x210e1c;},_0x499f(_0x40b4d5,_0x1dd6b5);}export class NTQQSystemApi{static async[_0x58874f(0xf6)](){var _0x2d3916=_0x58874f;return napCatCore['util'][_0x2d3916(0xf6)]();}static async[_0x58874f(0xf4)](_0x20b49c){var _0x20ca46=_0x58874f;return napCatCore['session'][_0x20ca46(0xea)]()[_0x20ca46(0xf1)](_0x20b49c);}static async['translateEnWordToZn'](_0x441891){var _0x815a7e=_0x58874f;return napCatCore['session'][_0x815a7e(0xf5)]()[_0x815a7e(0xe6)](_0x441891);}}
+var _0x3c8fd6=_0x2da5;(function(_0x32f2af,_0x4f9204){var _0x84e4a6=_0x2da5,_0x43455d=_0x32f2af();while(!![]){try{var _0x125d10=-parseInt(_0x84e4a6(0x134))/0x1+parseInt(_0x84e4a6(0x132))/0x2*(parseInt(_0x84e4a6(0x133))/0x3)+parseInt(_0x84e4a6(0x12a))/0x4+parseInt(_0x84e4a6(0x12d))/0x5+-parseInt(_0x84e4a6(0x12f))/0x6*(-parseInt(_0x84e4a6(0x135))/0x7)+parseInt(_0x84e4a6(0x129))/0x8+parseInt(_0x84e4a6(0x137))/0x9*(-parseInt(_0x84e4a6(0x128))/0xa);if(_0x125d10===_0x4f9204)break;else _0x43455d['push'](_0x43455d['shift']());}catch(_0x5dd3c1){_0x43455d['push'](_0x43455d['shift']());}}}(_0x2c37,0x9aed1));function _0x2c37(){var _0x3c4a42=['1071768EoLYXl','3542ygTcPx','session','72NPLLKG','1273870Mgwhvk','7428440tNbVHc','2827624FecycE','getNodeMiscService','util','1281565VMIMYo','hasOtherRunningQQProcess','3018fVVqsA','wantWinScreenOCR','ORCImage','158lttkut','21993fJjkCy'];_0x2c37=function(){return _0x3c4a42;};return _0x2c37();}import{napCatCore}from'@/core';function _0x2da5(_0xd81610,_0x55a82b){var _0x2c3767=_0x2c37();return _0x2da5=function(_0x2da58c,_0x410220){_0x2da58c=_0x2da58c-0x128;var _0x4169b0=_0x2c3767[_0x2da58c];return _0x4169b0;},_0x2da5(_0xd81610,_0x55a82b);}export class NTQQSystemApi{static async['hasOtherRunningQQProcess'](){var _0x56f53c=_0x2da5;return napCatCore[_0x56f53c(0x12c)][_0x56f53c(0x12e)]();}static async[_0x3c8fd6(0x131)](_0x254c26){var _0xa9638d=_0x3c8fd6;return napCatCore['session'][_0xa9638d(0x12b)]()[_0xa9638d(0x130)](_0x254c26);}static async['translateEnWordToZn'](_0x131b69){var _0x3557b1=_0x3c8fd6;return napCatCore[_0x3557b1(0x136)]['getRichMediaService']()['translateEnWordToZn'](_0x131b69);}}

src/core.lib/src/apis/user.d.ts

@@ -1,4 +1,4 @@
-import { User } from '@/core/entities';
+import { ModifyProfileParams, User, UserDetailInfoByUin } from '@/core/entities';
 import { GeneralCallResult } from '@/core';
 export declare class NTQQUserApi {
     static setSelfOnlineStatus(status: number, extStatus: number, batteryStatus: number): Promise<GeneralCallResult>;
@@ -14,6 +14,7 @@ export declare class NTQQUserApi {
     static getSelfInfo(): Promise<void>;
     static getUserInfo(uid: string): Promise<void>;
     static getUserDetailInfo(uid: string): Promise<User>;
+    static modifySelfProfile(param: ModifyProfileParams): Promise<GeneralCallResult>;
     static getPSkey(domainList: string[], cached?: boolean): Promise<{
         [key: string]: string;
     }>;
@@ -22,4 +23,7 @@ export declare class NTQQUserApi {
         [key: string]: string;
     }>;
     static getSkey(cached?: boolean): Promise<string | undefined>;
+    static getUidByUin(Uin: string): Promise<string | undefined>;
+    static getUinByUid(Uid: string | undefined): Promise<string | undefined>;
+    static getUserDetailInfoByUin(Uin: string): Promise<UserDetailInfoByUin>;
 }

src/core.lib/src/data.d.ts

@@ -29,8 +29,6 @@ export declare const napCatError: {
 export declare function getFriend(uinOrUid: string): Promise<Friend | undefined>;
 export declare function getGroup(qq: string | number): Promise<Group | undefined>;
 export declare function getGroupMember(groupQQ: string | number, memberUinOrUid: string | number): Promise<GroupMember | null | undefined>;
-export declare const uid2UinMap: Record<string, string>;
-export declare function getUidByUin(uin: string): string | undefined;
 export declare const tempGroupCodeMap: Record<string, string>;
 export declare const rawFriends: Array<BuddyCategoryType>;
 export declare const stat: {

src/core.lib/src/data.js

@@ -1 +1 @@
-const _0x2f143c=_0x4db3;(function(_0x6dcd91,_0x29429b){const _0x4a8a26=_0x4db3,_0x4fb3fa=_0x6dcd91();while(!![]){try{const _0x464690=parseInt(_0x4a8a26(0x180))/0x1*(-parseInt(_0x4a8a26(0x17f))/0x2)+parseInt(_0x4a8a26(0x18f))/0x3+-parseInt(_0x4a8a26(0x196))/0x4+parseInt(_0x4a8a26(0x184))/0x5*(-parseInt(_0x4a8a26(0x19a))/0x6)+-parseInt(_0x4a8a26(0x18d))/0x7+-parseInt(_0x4a8a26(0x190))/0x8*(-parseInt(_0x4a8a26(0x188))/0x9)+parseInt(_0x4a8a26(0x18b))/0xa*(parseInt(_0x4a8a26(0x187))/0xb);if(_0x464690===_0x29429b)break;else _0x4fb3fa['push'](_0x4fb3fa['shift']());}catch(_0x337e37){_0x4fb3fa['push'](_0x4fb3fa['shift']());}}}(_0x5784,0x5eba8));import{isNumeric}from'@/common/utils/helper';function _0x4db3(_0x48cfa0,_0x3a59e5){const _0x578412=_0x5784();return _0x4db3=function(_0x4db31f,_0x27eebd){_0x4db31f=_0x4db31f-0x17f;let _0x4f003c=_0x578412[_0x4db31f];return _0x4f003c;},_0x4db3(_0x48cfa0,_0x3a59e5);}import{NTQQGroupApi}from'@/core/apis';export const Credentials={'Skey':'','CreatTime':0x0,'Cookies':new Map(),'ClientKey':'','KeyIndex':'','PskeyData':new Map(),'PskeyTime':new Map()};export const WebGroupData={'GroupData':new Map(),'GroupTime':new Map()};export const selfInfo={'uid':'','uin':'','nick':'','online':!![]};function _0x5784(){const _0x42541c=['getGroups','groupCode','set','15765qlBhPu','get','delete','418RUuFVk','2107962BErqQv','forEach','length','459870rTLZoE','RJZnh','5085563AexJrI','uin','1060161rqBOtm','16ARissP','NapCat未能正常启动，请检查日志查看错误','from','zdmFc','getGroupMembers','find','2468796ZDIKVR','values','BqMqQ','gEpWX','846MopRqQ','toString','9248sSCRwC','85WiAhpP'];_0x5784=function(){return _0x42541c;};return _0x5784();}export const groups=new Map();export function deleteGroup(_0x429f1e){const _0x4ef735=_0x4db3;groups['delete'](_0x429f1e),groupMembers[_0x4ef735(0x186)](_0x429f1e);}export const groupMembers=new Map();export const friends=new Map();export const friendRequests={};export const groupNotifies={};export const napCatError={'ffmpegError':'','httpServerError':'','wsServerError':'','otherError':_0x2f143c(0x191)};export async function getFriend(_0x2b2ada){const _0x568b3d=_0x2f143c,_0x376f2c={'BqMqQ':function(_0x29fa15,_0x4472a5){return _0x29fa15(_0x4472a5);}};_0x2b2ada=_0x2b2ada['toString']();if(_0x376f2c[_0x568b3d(0x198)](isNumeric,_0x2b2ada)){const _0x1614c3=Array[_0x568b3d(0x192)](friends[_0x568b3d(0x197)]());return _0x1614c3[_0x568b3d(0x195)](_0x372792=>_0x372792[_0x568b3d(0x18e)]===_0x2b2ada);}else return friends[_0x568b3d(0x185)](_0x2b2ada);}export async function getGroup(_0x308df6){const _0xb82bdc=_0x2f143c;let _0x482e6e=groups[_0xb82bdc(0x185)](_0x308df6[_0xb82bdc(0x19b)]());if(!_0x482e6e)try{const _0x3de901=await NTQQGroupApi[_0xb82bdc(0x181)]();_0x3de901[_0xb82bdc(0x18a)]&&_0x3de901[_0xb82bdc(0x189)](_0x3e0e1c=>{const _0x3933f4=_0xb82bdc;groups[_0x3933f4(0x183)](_0x3e0e1c[_0x3933f4(0x182)],_0x3e0e1c);});}catch(_0x52729b){return undefined;}return _0x482e6e=groups['get'](_0x308df6[_0xb82bdc(0x19b)]()),_0x482e6e;}export async function getGroupMember(_0x5dab24,_0x158535){const _0x33cfc0=_0x2f143c,_0x922ff7={'RJZnh':function(_0x3db2aa,_0x38db5b){return _0x3db2aa(_0x38db5b);},'zdmFc':function(_0x4a96cd){return _0x4a96cd();}};_0x5dab24=_0x5dab24['toString'](),_0x158535=_0x158535[_0x33cfc0(0x19b)]();let _0x34f961=groupMembers[_0x33cfc0(0x185)](_0x5dab24);if(!_0x34f961)try{_0x34f961=await NTQQGroupApi[_0x33cfc0(0x194)](_0x5dab24),groupMembers[_0x33cfc0(0x183)](_0x5dab24,_0x34f961);}catch(_0x4bd608){return null;}const _0x42a152=()=>{const _0x3790ee=_0x33cfc0;let _0x33f1de=undefined;return _0x922ff7[_0x3790ee(0x18c)](isNumeric,_0x158535)?_0x33f1de=Array[_0x3790ee(0x192)](_0x34f961[_0x3790ee(0x197)]())['find'](_0x91b924=>_0x91b924[_0x3790ee(0x18e)]===_0x158535):_0x33f1de=_0x34f961[_0x3790ee(0x185)](_0x158535),_0x33f1de;};let _0x5d9468=_0x42a152();return!_0x5d9468&&(_0x34f961=await NTQQGroupApi['getGroupMembers'](_0x5dab24),_0x5d9468=_0x922ff7[_0x33cfc0(0x193)](_0x42a152)),_0x5d9468;}export const uid2UinMap={};export function getUidByUin(_0x27ee8c){const _0x5cc43c=_0x2f143c,_0x1d3f59={'gEpWX':function(_0x3ceb76,_0xb8a37a){return _0x3ceb76===_0xb8a37a;}};for(const _0x1d348e in uid2UinMap){if(_0x1d3f59[_0x5cc43c(0x199)](uid2UinMap[_0x1d348e],_0x27ee8c))return _0x1d348e;}}export const tempGroupCodeMap={};export const rawFriends=[];export const stat={'packet_received':0x0,'packet_sent':0x0,'message_received':0x0,'message_sent':0x0,'last_message_time':0x0,'disconnect_times':0x0,'lost_times':0x0,'packet_lost':0x0};
+const _0x90c644=_0x123d;(function(_0x3940bb,_0x51ad79){const _0x5a003e=_0x123d,_0x54f0bb=_0x3940bb();while(!![]){try{const _0x597c8b=parseInt(_0x5a003e(0xf8))/0x1+parseInt(_0x5a003e(0xfd))/0x2*(-parseInt(_0x5a003e(0xf1))/0x3)+-parseInt(_0x5a003e(0x105))/0x4*(-parseInt(_0x5a003e(0xfb))/0x5)+-parseInt(_0x5a003e(0xf7))/0x6*(-parseInt(_0x5a003e(0x106))/0x7)+parseInt(_0x5a003e(0x103))/0x8+parseInt(_0x5a003e(0xf6))/0x9+-parseInt(_0x5a003e(0x101))/0xa;if(_0x597c8b===_0x51ad79)break;else _0x54f0bb['push'](_0x54f0bb['shift']());}catch(_0x167d3c){_0x54f0bb['push'](_0x54f0bb['shift']());}}}(_0x246b,0x71229));import{isNumeric}from'@/common/utils/helper';import{NTQQGroupApi}from'@/core/apis';export const Credentials={'Skey':'','CreatTime':0x0,'Cookies':new Map(),'ClientKey':'','KeyIndex':'','PskeyData':new Map(),'PskeyTime':new Map()};export const WebGroupData={'GroupData':new Map(),'GroupTime':new Map()};export const selfInfo={'uid':'','uin':'','nick':'','online':!![]};export const groups=new Map();export function deleteGroup(_0x3dca23){const _0x8784a9=_0x123d;groups[_0x8784a9(0xf4)](_0x3dca23),groupMembers[_0x8784a9(0xf4)](_0x3dca23);}export const groupMembers=new Map();export const friends=new Map();export const friendRequests={};export const groupNotifies={};export const napCatError={'ffmpegError':'','httpServerError':'','wsServerError':'','otherError':_0x90c644(0xf9)};export async function getFriend(_0x4df720){const _0x1931c8=_0x90c644,_0x4b86d8={'RgFrX':function(_0x123db4,_0x2216ae){return _0x123db4(_0x2216ae);}};_0x4df720=_0x4df720[_0x1931c8(0xff)]();if(_0x4b86d8[_0x1931c8(0x108)](isNumeric,_0x4df720)){const _0x2de032=Array[_0x1931c8(0x100)](friends[_0x1931c8(0x102)]());return _0x2de032['find'](_0xc7230e=>_0xc7230e[_0x1931c8(0xfa)]===_0x4df720);}else return friends[_0x1931c8(0xf0)](_0x4df720);}export async function getGroup(_0x27e68a){const _0x460266=_0x90c644;let _0x22521a=groups[_0x460266(0xf0)](_0x27e68a[_0x460266(0xff)]());if(!_0x22521a)try{const _0x3d52c6=await NTQQGroupApi[_0x460266(0xf5)]();_0x3d52c6['length']&&_0x3d52c6[_0x460266(0xfc)](_0x292473=>{const _0x3b68f1=_0x460266;groups[_0x3b68f1(0x109)](_0x292473[_0x3b68f1(0x107)],_0x292473);});}catch(_0x449a41){return undefined;}return _0x22521a=groups['get'](_0x27e68a[_0x460266(0xff)]()),_0x22521a;}function _0x123d(_0xd7768c,_0x37ef4b){const _0x246b7c=_0x246b();return _0x123d=function(_0x123d56,_0x3b527f){_0x123d56=_0x123d56-0xf0;let _0x3fe38a=_0x246b7c[_0x123d56];return _0x3fe38a;},_0x123d(_0xd7768c,_0x37ef4b);}function _0x246b(){const _0x1bd0f3=['get','9SMTtDy','getGroupMembers','bOSxo','delete','getGroups','5206401anodZZ','2574uhYjfn','277XtWdDB','NapCat未能正常启动，请检查日志查看错误','uin','847385flKNhp','forEach','116462BkuBux','OzWpi','toString','from','12369090LFYdWO','values','2650448wUauQe','find','20Lzbyyv','1918gIFIYs','groupCode','RgFrX','set'];_0x246b=function(){return _0x1bd0f3;};return _0x246b();}export async function getGroupMember(_0x5284d9,_0x20e5c9){const _0x26cdcb=_0x90c644,_0x16274e={'bOSxo':function(_0x4572f5,_0x38831a){return _0x4572f5(_0x38831a);},'xiQEB':function(_0x38e3f6){return _0x38e3f6();},'OzWpi':function(_0x22e0b7){return _0x22e0b7();}};_0x5284d9=_0x5284d9[_0x26cdcb(0xff)](),_0x20e5c9=_0x20e5c9[_0x26cdcb(0xff)]();let _0x3b7e1b=groupMembers[_0x26cdcb(0xf0)](_0x5284d9);if(!_0x3b7e1b)try{_0x3b7e1b=await NTQQGroupApi['getGroupMembers'](_0x5284d9),groupMembers[_0x26cdcb(0x109)](_0x5284d9,_0x3b7e1b);}catch(_0x2803ee){return null;}const _0x1596e7=()=>{const _0x2686cd=_0x26cdcb;let _0x435364=undefined;return _0x16274e[_0x2686cd(0xf3)](isNumeric,_0x20e5c9)?_0x435364=Array['from'](_0x3b7e1b['values']())[_0x2686cd(0x104)](_0x1de9f3=>_0x1de9f3['uin']===_0x20e5c9):_0x435364=_0x3b7e1b['get'](_0x20e5c9),_0x435364;};let _0x477a8f=_0x16274e['xiQEB'](_0x1596e7);return!_0x477a8f&&(_0x3b7e1b=await NTQQGroupApi[_0x26cdcb(0xf2)](_0x5284d9),_0x477a8f=_0x16274e[_0x26cdcb(0xfe)](_0x1596e7)),_0x477a8f;}export const tempGroupCodeMap={};export const rawFriends=[];export const stat={'packet_received':0x0,'packet_sent':0x0,'message_received':0x0,'message_sent':0x0,'last_message_time':0x0,'disconnect_times':0x0,'lost_times':0x0,'packet_lost':0x0};

src/core.lib/src/entities/cache.js

@@ -1 +1 @@
-(function(_0x4b175e,_0x452713){var _0x404486=_0x35b6,_0x4481cc=_0x4b175e();while(!![]){try{var _0x40b0ac=parseInt(_0x404486(0x1c9))/0x1+-parseInt(_0x404486(0x1ce))/0x2*(parseInt(_0x404486(0x1cb))/0x3)+-parseInt(_0x404486(0x1c5))/0x4+parseInt(_0x404486(0x1c3))/0x5*(parseInt(_0x404486(0x1ca))/0x6)+parseInt(_0x404486(0x1c7))/0x7*(parseInt(_0x404486(0x1bf))/0x8)+parseInt(_0x404486(0x1bb))/0x9*(-parseInt(_0x404486(0x1cf))/0xa)+parseInt(_0x404486(0x1bd))/0xb*(parseInt(_0x404486(0x1cd))/0xc);if(_0x40b0ac===_0x452713)break;else _0x4481cc['push'](_0x4481cc['shift']());}catch(_0x1e1964){_0x4481cc['push'](_0x4481cc['shift']());}}}(_0x1730,0x4cfc6));;function _0x1730(){var _0x386f4a=['27hhgRWY','sITvM','967087wLIDnb','split','8Auensn','qfLgq','AUDIO','VIDEO','10MCZkne','IMAGE','1574844WDzRid','DOCUMENT','349937NbFSsB','OTHER','386302HKiqRN','838368fymGmy','3fwpTnC','RjXbr','132AufSvg','737076fvznmL','2017510uDaNMA'];_0x1730=function(){return _0x386f4a;};return _0x1730();}function _0x35b6(_0x377741,_0x6f7eb5){var _0x1730f1=_0x1730();return _0x35b6=function(_0x35b67e,_0x23361f){_0x35b67e=_0x35b67e-0x1bb;var _0x427dc3=_0x1730f1[_0x35b67e];return _0x427dc3;},_0x35b6(_0x377741,_0x6f7eb5);}export var CacheFileType;(function(_0x4459eb){var _0xc5079e=_0x35b6,_0x1e9f17={'RjXbr':'1|2|4|3|0','qfLgq':_0xc5079e(0x1c8),'VHPiP':_0xc5079e(0x1c4),'sITvM':_0xc5079e(0x1c2),'ioWiG':_0xc5079e(0x1c6),'ytjzY':_0xc5079e(0x1c1)},_0x2549df=_0x1e9f17[_0xc5079e(0x1cc)][_0xc5079e(0x1be)]('|'),_0x5eedeb=0x0;while(!![]){switch(_0x2549df[_0x5eedeb++]){case'0':_0x4459eb[_0x4459eb[_0x1e9f17[_0xc5079e(0x1c0)]]=0x4]=_0x1e9f17['qfLgq'];continue;case'1':_0x4459eb[_0x4459eb[_0xc5079e(0x1c4)]=0x0]=_0x1e9f17['VHPiP'];continue;case'2':_0x4459eb[_0x4459eb[_0x1e9f17[_0xc5079e(0x1bc)]]=0x1]=_0x1e9f17[_0xc5079e(0x1bc)];continue;case'3':_0x4459eb[_0x4459eb[_0x1e9f17['ioWiG']]=0x3]=_0xc5079e(0x1c6);continue;case'4':_0x4459eb[_0x4459eb[_0x1e9f17['ytjzY']]=0x2]=_0x1e9f17['ytjzY'];continue;}break;}}(CacheFileType||(CacheFileType={})));
+(function(_0x571cd6,_0x4f3711){var _0x45c8cc=_0x5742,_0x10d69f=_0x571cd6();while(!![]){try{var _0x1a8798=-parseInt(_0x45c8cc(0xe3))/0x1+-parseInt(_0x45c8cc(0xea))/0x2*(parseInt(_0x45c8cc(0xe7))/0x3)+-parseInt(_0x45c8cc(0xec))/0x4*(-parseInt(_0x45c8cc(0xed))/0x5)+-parseInt(_0x45c8cc(0xf4))/0x6*(-parseInt(_0x45c8cc(0xe4))/0x7)+-parseInt(_0x45c8cc(0xf0))/0x8*(-parseInt(_0x45c8cc(0xee))/0x9)+-parseInt(_0x45c8cc(0xe2))/0xa+parseInt(_0x45c8cc(0xeb))/0xb;if(_0x1a8798===_0x4f3711)break;else _0x10d69f['push'](_0x10d69f['shift']());}catch(_0x5d8ca3){_0x10d69f['push'](_0x10d69f['shift']());}}}(_0x2279,0x3dab5));;export var CacheFileType;function _0x2279(){var _0x559982=['7VpxAZi','SOvfy','split','24675MRwhKn','VIDEO','FYODZ','14zOysSk','663388bHWuoO','8236KdZOhb','205FdyzIS','54nOJghj','DOCUMENT','49880rPqXTH','IMAGE','AUDIO','LUehk','2958198IiuVkN','lOqHC','OTHER','DgAml','3035560wRNTYR','61442IePxgt'];_0x2279=function(){return _0x559982;};return _0x2279();}function _0x5742(_0x550f0d,_0x4125a3){var _0x2279de=_0x2279();return _0x5742=function(_0x574215,_0x55e309){_0x574215=_0x574215-0xe1;var _0x5a0360=_0x2279de[_0x574215];return _0x5a0360;},_0x5742(_0x550f0d,_0x4125a3);}(function(_0x22d635){var _0x4ebe49=_0x5742,_0x29a76f={'DgAml':_0x4ebe49(0xef),'lOqHC':_0x4ebe49(0xe8),'SOvfy':_0x4ebe49(0xf1),'FYODZ':_0x4ebe49(0xf2),'LUehk':_0x4ebe49(0xf6)},_0x3fe20f='2|1|3|0|4'[_0x4ebe49(0xe6)]('|'),_0xd1d66a=0x0;while(!![]){switch(_0x3fe20f[_0xd1d66a++]){case'0':_0x22d635[_0x22d635[_0x29a76f['DgAml']]=0x3]=_0x29a76f[_0x4ebe49(0xe1)];continue;case'1':_0x22d635[_0x22d635[_0x29a76f[_0x4ebe49(0xf5)]]=0x1]=_0x29a76f['lOqHC'];continue;case'2':_0x22d635[_0x22d635[_0x29a76f[_0x4ebe49(0xe5)]]=0x0]=_0x4ebe49(0xf1);continue;case'3':_0x22d635[_0x22d635[_0x29a76f[_0x4ebe49(0xe9)]]=0x2]=_0x29a76f[_0x4ebe49(0xe9)];continue;case'4':_0x22d635[_0x22d635[_0x4ebe49(0xf6)]=0x4]=_0x29a76f[_0x4ebe49(0xf3)];continue;}break;}}(CacheFileType||(CacheFileType={})));

src/core.lib/src/entities/constructor.d.ts

@@ -5,7 +5,7 @@ export declare class SendMsgElementConstructor {
     static at(atUid: string, atNtUid: string, atType: AtType, atName: string): SendTextElement;
     static reply(msgSeq: string, msgId: string, senderUin: string, senderUinStr: string): SendReplyElement;
     static pic(picPath: string, summary?: string, subType?: 0 | 1): Promise<SendPicElement>;
-    static file(filePath: string, fileName?: string): Promise<SendFileElement>;
+    static file(filePath: string, fileName?: string, folderId?: string): Promise<SendFileElement>;
     static video(filePath: string, fileName?: string, diyThumbPath?: string): Promise<SendVideoElement>;
     static ptt(pttPath: string): Promise<SendPttElement>;
     static face(faceId: number): SendFaceElement;

src/core.lib/src/entities/group.js

@@ -1 +1 @@
-(function(_0x2629d1,_0x1746d3){var _0x181451=_0x20bc,_0x108b02=_0x2629d1();while(!![]){try{var _0x1681bc=parseInt(_0x181451(0x7f))/0x1*(parseInt(_0x181451(0x85))/0x2)+-parseInt(_0x181451(0x80))/0x3+-parseInt(_0x181451(0x83))/0x4+parseInt(_0x181451(0x7a))/0x5+-parseInt(_0x181451(0x7e))/0x6+parseInt(_0x181451(0x81))/0x7*(parseInt(_0x181451(0x82))/0x8)+parseInt(_0x181451(0x7d))/0x9;if(_0x1681bc===_0x1746d3)break;else _0x108b02['push'](_0x108b02['shift']());}catch(_0x26cca1){_0x108b02['push'](_0x108b02['shift']());}}}(_0x73c7,0x29b06));export var GroupMemberRole;function _0x73c7(){var _0x41f620=['4655214RMHLAw','749034NyxcBU','1zXuUYy','998340vAazLm','28LhXqGW','431272UOyzjL','1123168iPPRvo','owner','6398sMMcyX','wRNWM','eUskL','normal','865440STWwdT','admin','kvlaV'];_0x73c7=function(){return _0x41f620;};return _0x73c7();}function _0x20bc(_0x46f0ba,_0x5d6a8d){var _0x73c76f=_0x73c7();return _0x20bc=function(_0x20bc9f,_0x39efe7){_0x20bc9f=_0x20bc9f-0x79;var _0x385b90=_0x73c76f[_0x20bc9f];return _0x385b90;},_0x20bc(_0x46f0ba,_0x5d6a8d);}(function(_0x1bdbef){var _0x32a4a3=_0x20bc,_0xff7650={'kvlaV':_0x32a4a3(0x79),'wRNWM':'admin','eUskL':_0x32a4a3(0x84)};_0x1bdbef[_0x1bdbef[_0x32a4a3(0x79)]=0x2]=_0xff7650[_0x32a4a3(0x7c)],_0x1bdbef[_0x1bdbef[_0x32a4a3(0x7b)]=0x3]=_0xff7650[_0x32a4a3(0x86)],_0x1bdbef[_0x1bdbef[_0x32a4a3(0x84)]=0x4]=_0xff7650[_0x32a4a3(0x87)];}(GroupMemberRole||(GroupMemberRole={})));
+(function(_0x3eba37,_0x497acf){var _0x57a4ab=_0x55e0,_0x130b4f=_0x3eba37();while(!![]){try{var _0xecf628=parseInt(_0x57a4ab(0x17c))/0x1+-parseInt(_0x57a4ab(0x177))/0x2*(-parseInt(_0x57a4ab(0x175))/0x3)+parseInt(_0x57a4ab(0x170))/0x4+parseInt(_0x57a4ab(0x17a))/0x5*(-parseInt(_0x57a4ab(0x176))/0x6)+-parseInt(_0x57a4ab(0x174))/0x7+parseInt(_0x57a4ab(0x17d))/0x8+-parseInt(_0x57a4ab(0x172))/0x9*(-parseInt(_0x57a4ab(0x17e))/0xa);if(_0xecf628===_0x497acf)break;else _0x130b4f['push'](_0x130b4f['shift']());}catch(_0x2fbf8d){_0x130b4f['push'](_0x130b4f['shift']());}}}(_0x3c9a,0xef86e));export var GroupMemberRole;function _0x55e0(_0x48630f,_0x2ef894){var _0x3c9a72=_0x3c9a();return _0x55e0=function(_0x55e0fb,_0xd5f033){_0x55e0fb=_0x55e0fb-0x16f;var _0x5a2abd=_0x3c9a72[_0x55e0fb];return _0x5a2abd;},_0x55e0(_0x48630f,_0x2ef894);}(function(_0x5ed4fe){var _0x382368=_0x55e0,_0x5ae093={'fJBqw':'normal','DBtFa':_0x382368(0x178),'lspvJ':_0x382368(0x173)};_0x5ed4fe[_0x5ed4fe[_0x5ae093[_0x382368(0x179)]]=0x2]=_0x382368(0x171),_0x5ed4fe[_0x5ed4fe[_0x5ae093[_0x382368(0x17b)]]=0x3]=_0x5ae093[_0x382368(0x17b)],_0x5ed4fe[_0x5ed4fe[_0x5ae093[_0x382368(0x16f)]]=0x4]=_0x5ae093[_0x382368(0x16f)];}(GroupMemberRole||(GroupMemberRole={})));function _0x3c9a(){var _0x57609b=['DBtFa','131804DlumfY','4111680ZHsNib','13235610izFxgw','lspvJ','1084276bJCTmi','normal','9FXJtsd','owner','10114272geIRjz','39hTvjYO','6rBqmVR','231698KnfXFC','admin','fJBqw','6602165hCGwNb'];_0x3c9a=function(){return _0x57609b;};return _0x3c9a();}

src/core.lib/src/entities/index.js

@@ -1 +1 @@
-(function(_0x3eeb70,_0x20726b){var _0x4e0a62=_0x45ed,_0x5d24d3=_0x3eeb70();while(!![]){try{var _0x24a9a9=-parseInt(_0x4e0a62(0x1d1))/0x1*(-parseInt(_0x4e0a62(0x1d2))/0x2)+parseInt(_0x4e0a62(0x1d8))/0x3*(parseInt(_0x4e0a62(0x1d0))/0x4)+-parseInt(_0x4e0a62(0x1d5))/0x5+parseInt(_0x4e0a62(0x1d3))/0x6+-parseInt(_0x4e0a62(0x1cf))/0x7+-parseInt(_0x4e0a62(0x1d4))/0x8+parseInt(_0x4e0a62(0x1d6))/0x9*(-parseInt(_0x4e0a62(0x1d7))/0xa);if(_0x24a9a9===_0x20726b)break;else _0x5d24d3['push'](_0x5d24d3['shift']());}catch(_0x26adba){_0x5d24d3['push'](_0x5d24d3['shift']());}}}(_0x3535,0x2535d));export*from'./user';export*from'./group';export*from'./msg';export*from'./notify';function _0x3535(){var _0x205547=['1mmqEBQ','344224jhMupL','629478JzYVFn','1819312lOyRbI','339535cdzRkR','478917sgjIAV','10SSmTVa','15ZmGVnF','116291sPfHbC','192428Gfzgwg'];_0x3535=function(){return _0x205547;};return _0x3535();}export*from'./cache';function _0x45ed(_0xd044b6,_0x188143){var _0x3535da=_0x3535();return _0x45ed=function(_0x45ed5d,_0x3ad035){_0x45ed5d=_0x45ed5d-0x1cf;var _0x1a9f0b=_0x3535da[_0x45ed5d];return _0x1a9f0b;},_0x45ed(_0xd044b6,_0x188143);}export*from'./constructor';
+function _0x529c(_0x34841d,_0x2a6039){var _0x498a17=_0x498a();return _0x529c=function(_0x529cee,_0xa4b0aa){_0x529cee=_0x529cee-0xf8;var _0xe4d279=_0x498a17[_0x529cee];return _0xe4d279;},_0x529c(_0x34841d,_0x2a6039);}(function(_0x3f3b10,_0x265363){var _0x3db235=_0x529c,_0x2e527b=_0x3f3b10();while(!![]){try{var _0x13ee98=-parseInt(_0x3db235(0xf8))/0x1*(parseInt(_0x3db235(0x100))/0x2)+parseInt(_0x3db235(0x102))/0x3+-parseInt(_0x3db235(0xfc))/0x4+parseInt(_0x3db235(0xfe))/0x5*(-parseInt(_0x3db235(0x103))/0x6)+-parseInt(_0x3db235(0xff))/0x7*(parseInt(_0x3db235(0x101))/0x8)+-parseInt(_0x3db235(0xf9))/0x9*(-parseInt(_0x3db235(0xfd))/0xa)+parseInt(_0x3db235(0xfa))/0xb*(parseInt(_0x3db235(0xfb))/0xc);if(_0x13ee98===_0x265363)break;else _0x2e527b['push'](_0x2e527b['shift']());}catch(_0x8782c5){_0x2e527b['push'](_0x2e527b['shift']());}}}(_0x498a,0x76326));export*from'./user';export*from'./group';function _0x498a(){var _0x3a2a4d=['744wNyLIN','188608wQddIZ','387570AJVwXd','139575TCDwJF','7fAOeuC','4GmhCJD','4424152BpiXAa','2268201QppAsq','120eBPoGq','481972chQkVc','198gTdWlb','177034rWaAMp'];_0x498a=function(){return _0x3a2a4d;};return _0x498a();}export*from'./msg';export*from'./notify';export*from'./cache';export*from'./constructor';

src/core.lib/src/entities/msg.d.ts

@@ -115,6 +115,7 @@ export interface FileElement {
     fileSize: string;
     picHeight?: number;
     picWidth?: number;
+    folderId?: string;
     picThumbPath?: Map<number, string>;
     file10MMd5?: string;
     fileSha?: string;

src/core.lib/src/entities/notify.js

@@ -1 +1 @@
-(function(_0x50fc83,_0xa9b6e){var _0x3e9640=_0x5823,_0x4ab2e7=_0x50fc83();while(!![]){try{var _0x34a23a=parseInt(_0x3e9640(0x1fb))/0x1+-parseInt(_0x3e9640(0x1dc))/0x2*(parseInt(_0x3e9640(0x1e8))/0x3)+-parseInt(_0x3e9640(0x1ee))/0x4+-parseInt(_0x3e9640(0x1f6))/0x5*(-parseInt(_0x3e9640(0x1f9))/0x6)+-parseInt(_0x3e9640(0x1f1))/0x7*(parseInt(_0x3e9640(0x1df))/0x8)+-parseInt(_0x3e9640(0x1e0))/0x9*(parseInt(_0x3e9640(0x1f4))/0xa)+parseInt(_0x3e9640(0x1f8))/0xb;if(_0x34a23a===_0xa9b6e)break;else _0x4ab2e7['push'](_0x4ab2e7['shift']());}catch(_0x5f1083){_0x4ab2e7['push'](_0x4ab2e7['shift']());}}}(_0x2b2a,0xf2426));export var GroupNotifyTypes;(function(_0x1bee10){var _0x4d190f=_0x5823,_0x32dacf={'mqfNe':'INVITE_ME','hrtTj':_0x4d190f(0x1eb),'iVCds':_0x4d190f(0x1d9),'Wqqgr':_0x4d190f(0x1e4),'mhFnM':_0x4d190f(0x1ed),'Ohadp':_0x4d190f(0x1f2),'DcOFc':_0x4d190f(0x1e1)};_0x1bee10[_0x1bee10[_0x4d190f(0x1d8)]=0x1]=_0x32dacf['mqfNe'],_0x1bee10[_0x1bee10[_0x32dacf[_0x4d190f(0x1e9)]]=0x4]=_0x4d190f(0x1eb),_0x1bee10[_0x1bee10[_0x4d190f(0x1ef)]=0x7]=_0x4d190f(0x1ef),_0x1bee10[_0x1bee10[_0x32dacf[_0x4d190f(0x1da)]]=0x8]='ADMIN_SET',_0x1bee10[_0x1bee10[_0x32dacf[_0x4d190f(0x1ea)]]=0x9]=_0x32dacf[_0x4d190f(0x1ea)],_0x1bee10[_0x1bee10[_0x32dacf['mhFnM']]=0xb]=_0x32dacf[_0x4d190f(0x1db)],_0x1bee10[_0x1bee10[_0x32dacf[_0x4d190f(0x1dd)]]=0xc]=_0x32dacf[_0x4d190f(0x1dd)],_0x1bee10[_0x1bee10[_0x32dacf[_0x4d190f(0x1e3)]]=0xd]=_0x32dacf[_0x4d190f(0x1e3)];}(GroupNotifyTypes||(GroupNotifyTypes={})));export var GroupNotifyStatus;function _0x2b2a(){var _0x3fafab=['mhFnM','4KaQOAO','Ohadp','iKXWS','120KEGoua','5112yEsyum','ADMIN_UNSET_OTHER','WAIT_HANDLE','DcOFc','KICK_MEMBER','REJECT','rMYNO','ORPnf','1507299mNkRyh','hrtTj','Wqqgr','INVITED_JOIN','qOHib','MEMBER_EXIT','2982496DEDNKZ','JOIN_REQUEST','reject','714602kJWEbL','ADMIN_UNSET','approve','21290SOJJGb','WyOZC','5WZHJAI','IGNORE','30060778shJLGT','9564666OkUmOc','TjHiN','1156437LWpZrN','APPROVE','INVITE_ME','ADMIN_SET','iVCds'];_0x2b2a=function(){return _0x3fafab;};return _0x2b2a();}(function(_0x53562f){var _0x5962a2=_0x5823,_0x31bb04={'iKXWS':_0x5962a2(0x1f7),'ORPnf':_0x5962a2(0x1e2),'WyOZC':_0x5962a2(0x1d7),'rMYNO':_0x5962a2(0x1e5)};_0x53562f[_0x53562f[_0x5962a2(0x1f7)]=0x0]=_0x31bb04[_0x5962a2(0x1de)],_0x53562f[_0x53562f[_0x31bb04[_0x5962a2(0x1e7)]]=0x1]=_0x31bb04['ORPnf'],_0x53562f[_0x53562f[_0x31bb04[_0x5962a2(0x1f5)]]=0x2]='APPROVE',_0x53562f[_0x53562f[_0x31bb04[_0x5962a2(0x1e6)]]=0x3]=_0x31bb04[_0x5962a2(0x1e6)];}(GroupNotifyStatus||(GroupNotifyStatus={})));export var GroupRequestOperateTypes;function _0x5823(_0x8c74bf,_0x107880){var _0x2b2a6b=_0x2b2a();return _0x5823=function(_0x582356,_0x1df26a){_0x582356=_0x582356-0x1d7;var _0x337fab=_0x2b2a6b[_0x582356];return _0x337fab;},_0x5823(_0x8c74bf,_0x107880);}(function(_0x46e652){var _0x1f7680=_0x5823,_0x15fe34={'TjHiN':_0x1f7680(0x1f3),'qOHib':_0x1f7680(0x1f0)};_0x46e652[_0x46e652[_0x15fe34[_0x1f7680(0x1fa)]]=0x1]='approve',_0x46e652[_0x46e652[_0x15fe34['qOHib']]=0x2]=_0x15fe34[_0x1f7680(0x1ec)];}(GroupRequestOperateTypes||(GroupRequestOperateTypes={})));
+(function(_0x7d0811,_0x9559dc){var _0x2bc126=_0x5d56,_0x2d90d0=_0x7d0811();while(!![]){try{var _0x54f71d=parseInt(_0x2bc126(0x100))/0x1+parseInt(_0x2bc126(0x10b))/0x2*(-parseInt(_0x2bc126(0x101))/0x3)+-parseInt(_0x2bc126(0x11b))/0x4*(-parseInt(_0x2bc126(0x11c))/0x5)+-parseInt(_0x2bc126(0x105))/0x6+parseInt(_0x2bc126(0x11a))/0x7*(-parseInt(_0x2bc126(0x11f))/0x8)+-parseInt(_0x2bc126(0x111))/0x9+parseInt(_0x2bc126(0x119))/0xa;if(_0x54f71d===_0x9559dc)break;else _0x2d90d0['push'](_0x2d90d0['shift']());}catch(_0x3596b4){_0x2d90d0['push'](_0x2d90d0['shift']());}}}(_0x376e,0x63684));function _0x5d56(_0x4ce3b5,_0x259540){var _0x376e4a=_0x376e();return _0x5d56=function(_0x5d5641,_0xeaf8e6){_0x5d5641=_0x5d5641-0x100;var _0x3548a5=_0x376e4a[_0x5d5641];return _0x3548a5;},_0x5d56(_0x4ce3b5,_0x259540);}export var GroupNotifyTypes;(function(_0x310d35){var _0x149231=_0x5d56,_0x252710={'NZCnw':_0x149231(0x114),'uPFzG':_0x149231(0x108),'DwNXE':_0x149231(0x116),'yCiJX':_0x149231(0x10e),'BCOxf':_0x149231(0x107),'GAGDE':'ADMIN_UNSET','OiNWa':_0x149231(0x109),'pskiF':'MEMBER_EXIT','Bpgjo':'KICK_MEMBER'},_0x5b56b2=_0x252710['NZCnw'][_0x149231(0x10f)]('|'),_0x4626e2=0x0;while(!![]){switch(_0x5b56b2[_0x4626e2++]){case'0':_0x310d35[_0x310d35[_0x252710[_0x149231(0x117)]]=0xd]=_0x252710[_0x149231(0x117)];continue;case'1':_0x310d35[_0x310d35[_0x252710[_0x149231(0x110)]]=0x7]=_0x149231(0x116);continue;case'2':_0x310d35[_0x310d35[_0x149231(0x10e)]=0x8]=_0x252710[_0x149231(0x115)];continue;case'3':_0x310d35[_0x310d35[_0x252710[_0x149231(0x106)]]=0x1]=_0x252710['BCOxf'];continue;case'4':_0x310d35[_0x310d35[_0x252710[_0x149231(0x118)]]=0xc]=_0x252710[_0x149231(0x118)];continue;case'5':_0x310d35[_0x310d35[_0x252710['OiNWa']]=0x4]=_0x252710[_0x149231(0x120)];continue;case'6':_0x310d35[_0x310d35[_0x252710['pskiF']]=0xb]='MEMBER_EXIT';continue;case'7':_0x310d35[_0x310d35[_0x252710[_0x149231(0x102)]]=0x9]=_0x252710[_0x149231(0x102)];continue;}break;}}(GroupNotifyTypes||(GroupNotifyTypes={})));export var GroupNotifyStatus;function _0x376e(){var _0x9f7aea=['OiNWa','551978sJCSWv','3ItdETv','Bpgjo','AUuZe','APPROVE','432372hfqjfO','BCOxf','INVITE_ME','ADMIN_UNSET_OTHER','INVITED_JOIN','hyeoQ','130286qZdFuj','approve','ewsuQ','ADMIN_SET','split','DwNXE','3269115OUxudj','rJAOJ','NhqhX','3|5|1|2|7|6|4|0','yCiJX','JOIN_REQUEST','uPFzG','GAGDE','445560MqVxpy','5509NhgopD','196492RXobeV','75HVaGho','REJECT','mfiGK','4328IfBBZw'];_0x376e=function(){return _0x9f7aea;};return _0x376e();}(function(_0x5c4ac4){var _0x545e79=_0x5d56,_0x4e37ef={'ewsuQ':'IGNORE','rJAOJ':'WAIT_HANDLE','mfiGK':_0x545e79(0x104),'NhqhX':_0x545e79(0x11d)};_0x5c4ac4[_0x5c4ac4[_0x4e37ef[_0x545e79(0x10d)]]=0x0]=_0x4e37ef['ewsuQ'],_0x5c4ac4[_0x5c4ac4[_0x4e37ef['rJAOJ']]=0x1]=_0x4e37ef[_0x545e79(0x112)],_0x5c4ac4[_0x5c4ac4[_0x4e37ef[_0x545e79(0x11e)]]=0x2]=_0x545e79(0x104),_0x5c4ac4[_0x5c4ac4[_0x4e37ef[_0x545e79(0x113)]]=0x3]=_0x545e79(0x11d);}(GroupNotifyStatus||(GroupNotifyStatus={})));export var GroupRequestOperateTypes;(function(_0x8f4409){var _0x2787e0=_0x5d56,_0x3a43a0={'AUuZe':'approve','hyeoQ':'reject'};_0x8f4409[_0x8f4409[_0x2787e0(0x10c)]=0x1]=_0x3a43a0[_0x2787e0(0x103)],_0x8f4409[_0x8f4409['reject']=0x2]=_0x3a43a0[_0x2787e0(0x10a)];}(GroupRequestOperateTypes||(GroupRequestOperateTypes={})));

src/core.lib/src/entities/user.d.ts

@@ -9,6 +9,17 @@ export interface BuddyCategoryType {
     categroyMbCount: number;
     buddyList: User[];
 }
+export interface ModifyProfileParams {
+    nick: string;
+    longNick: string;
+    sex: Sex;
+    birthday: {
+        birthday_year: string;
+        birthday_month: string;
+        birthday_day: string;
+    };
+    location: any;
+}
 export interface BuddyProfileLikeReq {
     friendUids: string[];
     basic: number;
@@ -87,3 +98,72 @@ export interface SelfInfo extends User {
 }
 export interface Friend extends User {
 }
+export interface UserDetailInfoByUin {
+    result: number;
+    errMsg: string;
+    info: {
+        uid: string;
+        qid: string;
+        uin: string;
+        nick: string;
+        remark: string;
+        longNick: string;
+        avatarUrl: string;
+        birthday_year: number;
+        birthday_month: number;
+        birthday_day: number;
+        sex: number;
+        topTime: string;
+        constellation: number;
+        shengXiao: number;
+        kBloodType: number;
+        homeTown: string;
+        makeFriendCareer: number;
+        pos: string;
+        eMail: string;
+        phoneNum: string;
+        college: string;
+        country: string;
+        province: string;
+        city: string;
+        postCode: string;
+        address: string;
+        isBlock: boolean;
+        isSpecialCareOpen: boolean;
+        isSpecialCareZone: boolean;
+        ringId: string;
+        regTime: number;
+        interest: string;
+        termType: number;
+        labels: any[];
+        qqLevel: {
+            crownNum: number;
+            sunNum: number;
+            moonNum: number;
+            starNum: number;
+        };
+        isHideQQLevel: number;
+        privilegeIcon: {
+            jumpUrl: string;
+            openIconList: any[];
+            closeIconList: any[];
+        };
+        isHidePrivilegeIcon: number;
+        photoWall: {
+            picList: any[];
+        };
+        vipFlag: boolean;
+        yearVipFlag: boolean;
+        svipFlag: boolean;
+        vipLevel: number;
+        status: number;
+        qidianMasterFlag: number;
+        qidianCrewFlag: number;
+        qidianCrewFlag2: number;
+        extStatus: number;
+        recommendImgFlag: number;
+        disableEmojiShortCuts: number;
+        pendantId: string;
+        vipNameColorId: string;
+    };
+}

src/core.lib/src/entities/user.js

@@ -1 +1 @@
-(function(_0x4f031d,_0x410210){var _0x43b4ee=_0x4444,_0x29e1a1=_0x4f031d();while(!![]){try{var _0x5ed45e=parseInt(_0x43b4ee(0xd8))/0x1+parseInt(_0x43b4ee(0xd0))/0x2+parseInt(_0x43b4ee(0xd7))/0x3*(parseInt(_0x43b4ee(0xd1))/0x4)+-parseInt(_0x43b4ee(0xda))/0x5+-parseInt(_0x43b4ee(0xd2))/0x6+parseInt(_0x43b4ee(0xdb))/0x7+parseInt(_0x43b4ee(0xd3))/0x8;if(_0x5ed45e===_0x410210)break;else _0x29e1a1['push'](_0x29e1a1['shift']());}catch(_0x958326){_0x29e1a1['push'](_0x29e1a1['shift']());}}}(_0x400d,0x2b8b3));export var Sex;function _0x4444(_0x7b19c0,_0x172564){var _0x400d85=_0x400d();return _0x4444=function(_0x4444e3,_0x15f9fe){_0x4444e3=_0x4444e3-0xd0;var _0xcb12d2=_0x400d85[_0x4444e3];return _0xcb12d2;},_0x4444(_0x7b19c0,_0x172564);}function _0x400d(){var _0x57a345=['385120dWHWxt','4gekAvI','2099052IEomQh','290712JqydLj','female','VbKQY','male','1009293TZqjns','205863Gxinbe','syKOq','1681840aGoUWU','653604wBMfBz'];_0x400d=function(){return _0x57a345;};return _0x400d();}(function(_0x3effcf){var _0x5a950e=_0x4444,_0xb8a219={'VbKQY':_0x5a950e(0xd6),'mDCFp':'female','syKOq':'unknown'};_0x3effcf[_0x3effcf[_0xb8a219[_0x5a950e(0xd5)]]=0x1]=_0xb8a219['VbKQY'],_0x3effcf[_0x3effcf[_0x5a950e(0xd4)]=0x2]=_0xb8a219['mDCFp'],_0x3effcf[_0x3effcf['unknown']=0xff]=_0xb8a219[_0x5a950e(0xd9)];}(Sex||(Sex={})));
+function _0x558b(){var _0x2d7a37=['2DgwsfC','unknown','male','909007aLDGTT','female','40cJboYM','550ZnNSiv','251358ZSeMNF','8507223pxiWCJ','872tNciYj','52619qqgUxw','ogIfx','110170lfkhPG','japol','2492812hWIUSA','1340913ahJZBc'];_0x558b=function(){return _0x2d7a37;};return _0x558b();}function _0x224b(_0x4468a3,_0x34c094){var _0x558b52=_0x558b();return _0x224b=function(_0x224b73,_0x5d2b99){_0x224b73=_0x224b73-0x1a4;var _0x4bd9f2=_0x558b52[_0x224b73];return _0x4bd9f2;},_0x224b(_0x4468a3,_0x34c094);}(function(_0x2d4259,_0x7994db){var _0x2f727c=_0x224b,_0x552f46=_0x2d4259();while(!![]){try{var _0x1c622e=parseInt(_0x2f727c(0x1a6))/0x1*(parseInt(_0x2f727c(0x1b3))/0x2)+-parseInt(_0x2f727c(0x1b2))/0x3+-parseInt(_0x2f727c(0x1b1))/0x4+parseInt(_0x2f727c(0x1a8))/0x5*(parseInt(_0x2f727c(0x1aa))/0x6)+-parseInt(_0x2f727c(0x1ad))/0x7*(-parseInt(_0x2f727c(0x1ac))/0x8)+-parseInt(_0x2f727c(0x1ab))/0x9+-parseInt(_0x2f727c(0x1af))/0xa*(-parseInt(_0x2f727c(0x1a9))/0xb);if(_0x1c622e===_0x7994db)break;else _0x552f46['push'](_0x552f46['shift']());}catch(_0x5b18dd){_0x552f46['push'](_0x552f46['shift']());}}}(_0x558b,0x92395));export var Sex;(function(_0x5f3282){var _0x5a90b3=_0x224b,_0x13c50c={'SLLHM':_0x5a90b3(0x1a5),'japol':_0x5a90b3(0x1a7),'ogIfx':_0x5a90b3(0x1a4)};_0x5f3282[_0x5f3282[_0x5a90b3(0x1a5)]=0x1]=_0x13c50c['SLLHM'],_0x5f3282[_0x5f3282[_0x13c50c['japol']]=0x2]=_0x13c50c[_0x5a90b3(0x1b0)],_0x5f3282[_0x5f3282[_0x13c50c[_0x5a90b3(0x1ae)]]=0xff]=_0x5a90b3(0x1a4);}(Sex||(Sex={})));

src/core.lib/src/index.js

@@ -1 +1 @@
-(function(_0x4d124c,_0x474f33){var _0x4c62e6=_0x5e05,_0x1eeba3=_0x4d124c();while(!![]){try{var _0x29af9c=parseInt(_0x4c62e6(0x190))/0x1*(-parseInt(_0x4c62e6(0x191))/0x2)+-parseInt(_0x4c62e6(0x199))/0x3+parseInt(_0x4c62e6(0x198))/0x4*(parseInt(_0x4c62e6(0x193))/0x5)+-parseInt(_0x4c62e6(0x196))/0x6+-parseInt(_0x4c62e6(0x194))/0x7+parseInt(_0x4c62e6(0x195))/0x8*(parseInt(_0x4c62e6(0x197))/0x9)+parseInt(_0x4c62e6(0x192))/0xa;if(_0x29af9c===_0x474f33)break;else _0x1eeba3['push'](_0x1eeba3['shift']());}catch(_0x190ba3){_0x1eeba3['push'](_0x1eeba3['shift']());}}}(_0xda19,0x7850c));import _0xfd6550 from'./wrapper';export*from'./adapters';export*from'./apis';export*from'./entities';export*from'./listeners';function _0xda19(){var _0x18b492=['1981728UEGHyb','1NoPsPG','514190NPMpxt','20522330LvRRCk','105ljKZlR','2270555EKZSMR','8IMMUsj','4368558LXyEtB','883863ZRQPYH','59524DSYIKB'];_0xda19=function(){return _0x18b492;};return _0xda19();}export*from'./services';export*as Adapters from'./adapters';export*as APIs from'./apis';export*as Entities from'./entities';function _0x5e05(_0xb3d80d,_0x260eac){var _0xda1981=_0xda19();return _0x5e05=function(_0x5e056c,_0x3c5518){_0x5e056c=_0x5e056c-0x190;var _0x2fd7f5=_0xda1981[_0x5e056c];return _0x2fd7f5;},_0x5e05(_0xb3d80d,_0x260eac);}export*as Listeners from'./listeners';export*as Services from'./services';export{_0xfd6550 as Wrapper};export*as WrapperInterface from'./wrapper';export*as SessionConfig from'./sessionConfig';export{napCatCore}from'./core';
+(function(_0x541b13,_0x35fccd){var _0x2154d8=_0x2911,_0x1afe69=_0x541b13();while(!![]){try{var _0x589b2c=-parseInt(_0x2154d8(0x6d))/0x1*(-parseInt(_0x2154d8(0x6c))/0x2)+parseInt(_0x2154d8(0x68))/0x3+parseInt(_0x2154d8(0x69))/0x4+-parseInt(_0x2154d8(0x6b))/0x5+parseInt(_0x2154d8(0x6f))/0x6+-parseInt(_0x2154d8(0x6e))/0x7+parseInt(_0x2154d8(0x6a))/0x8;if(_0x589b2c===_0x35fccd)break;else _0x1afe69['push'](_0x1afe69['shift']());}catch(_0x57ecd0){_0x1afe69['push'](_0x1afe69['shift']());}}}(_0x3165,0x53e34));import _0x57022c from'./wrapper';export*from'./adapters';export*from'./apis';export*from'./entities';function _0x3165(){var _0x305877=['2264328RzFxvl','288606ZwHgPw','22688anxzHB','2580472dlEqwD','555150SjPbQS','71054TZWPGz','7EGAMfB','4171132FUZfjM'];_0x3165=function(){return _0x305877;};return _0x3165();}export*from'./listeners';export*from'./services';export*as Adapters from'./adapters';export*as APIs from'./apis';function _0x2911(_0x11910c,_0x354014){var _0x316599=_0x3165();return _0x2911=function(_0x291128,_0x8cc84e){_0x291128=_0x291128-0x68;var _0x2a5653=_0x316599[_0x291128];return _0x2a5653;},_0x2911(_0x11910c,_0x354014);}export*as Entities from'./entities';export*as Listeners from'./listeners';export*as Services from'./services';export{_0x57022c as Wrapper};export*as WrapperInterface from'./wrapper';export*as SessionConfig from'./sessionConfig';export{napCatCore}from'./core';

src/core.lib/src/listeners/NodeIKernelBuddyListener.js

@@ -1 +1 @@
-function _0x53de(){var _0x5ac79e=['18297PSxiEG','onAddBuddyNeedVerify','onSmartInfos','onBuddyReqUnreadCntChange','onAvatarUrlUpdated','onDoubtBuddyReqUnreadNumChange','2546412FKcrRD','539235CLVuEp','onCheckBuddySettingResult','onDoubtBuddyReqChange','onBuddyDetailInfoChange','6368WCQDyn','469eGHfJe','25086LuRHEu','2488244InAoQq','4814028bSQLxE','onBuddyReqChange','7119820KauiLh','5EtDBSf','onBlockChanged','onDelBatchBuddyInfos'];_0x53de=function(){return _0x5ac79e;};return _0x53de();}var _0x52f379=_0x4b9d;(function(_0xba55a5,_0x13a47f){var _0x5e3cda=_0x4b9d,_0x3394f0=_0xba55a5();while(!![]){try{var _0x267e6f=parseInt(_0x5e3cda(0x1f2))/0x1+parseInt(_0x5e3cda(0x1f9))/0x2+-parseInt(_0x5e3cda(0x1f1))/0x3+-parseInt(_0x5e3cda(0x1fa))/0x4*(parseInt(_0x5e3cda(0x1fd))/0x5)+-parseInt(_0x5e3cda(0x1f8))/0x6*(-parseInt(_0x5e3cda(0x1f7))/0x7)+-parseInt(_0x5e3cda(0x1f6))/0x8*(-parseInt(_0x5e3cda(0x200))/0x9)+-parseInt(_0x5e3cda(0x1fc))/0xa;if(_0x267e6f===_0x13a47f)break;else _0x3394f0['push'](_0x3394f0['shift']());}catch(_0x391563){_0x3394f0['push'](_0x3394f0['shift']());}}}(_0x53de,0xdffd3));function _0x4b9d(_0x56f43d,_0x2ac6ce){var _0x53dec2=_0x53de();return _0x4b9d=function(_0x4b9d44,_0x12993a){_0x4b9d44=_0x4b9d44-0x1ee;var _0x335aa7=_0x53dec2[_0x4b9d44];return _0x335aa7;},_0x4b9d(_0x56f43d,_0x2ac6ce);}export class BuddyListener{[_0x52f379(0x201)](_0x556e4c){}['onAddMeSettingChanged'](_0x20b0b0){}[_0x52f379(0x1ef)](_0x36f5d6){}[_0x52f379(0x1fe)](_0x8942ad){}[_0x52f379(0x1f5)](_0x33ceb4){}['onBuddyInfoChange'](_0xde1189){}['onBuddyListChange'](_0x3e022d){}['onBuddyRemarkUpdated'](_0xfd0f31){}[_0x52f379(0x1fb)](_0x5a5c6e){}[_0x52f379(0x1ee)](_0x38020a){}[_0x52f379(0x1f3)](_0x2da935){}[_0x52f379(0x1ff)](_0x4c02ff){}[_0x52f379(0x1f4)](_0x29e9b7){}[_0x52f379(0x1f0)](_0x117df9){}['onNickUpdated'](_0x1a779d){}[_0x52f379(0x202)](_0x4d0b8e){}['onSpacePermissionInfos'](_0x6a0a33){}}
+var _0x3261e9=_0x25da;function _0x25da(_0x4acf6b,_0x524728){var _0x4a1c20=_0x4a1c();return _0x25da=function(_0x25dabc,_0xc8d457){_0x25dabc=_0x25dabc-0x12e;var _0x2d5a0a=_0x4a1c20[_0x25dabc];return _0x2d5a0a;},_0x25da(_0x4acf6b,_0x524728);}(function(_0x2ac88b,_0x2ea05d){var _0x5c767=_0x25da,_0x36cfa6=_0x2ac88b();while(!![]){try{var _0x27cb5d=parseInt(_0x5c767(0x136))/0x1+-parseInt(_0x5c767(0x137))/0x2+parseInt(_0x5c767(0x131))/0x3+-parseInt(_0x5c767(0x13f))/0x4+parseInt(_0x5c767(0x134))/0x5+-parseInt(_0x5c767(0x132))/0x6+parseInt(_0x5c767(0x138))/0x7;if(_0x27cb5d===_0x2ea05d)break;else _0x36cfa6['push'](_0x36cfa6['shift']());}catch(_0x5e47ea){_0x36cfa6['push'](_0x36cfa6['shift']());}}}(_0x4a1c,0x6dea4));function _0x4a1c(){var _0x37142e=['onSmartInfos','onBlockChanged','onBuddyReqChange','onBuddyDetailInfoChange','1029921WHHwWZ','2865234HeJslG','onAddMeSettingChanged','1892405jLGijL','onNickUpdated','53073ATQIHq','1138794YdnQeC','7662767TOGxtq','onSpacePermissionInfos','onAddBuddyNeedVerify','onDoubtBuddyReqUnreadNumChange','onCheckBuddySettingResult','onBuddyInfoChange','onBuddyListChange','1489576ZcqAes'];_0x4a1c=function(){return _0x37142e;};return _0x4a1c();}export class BuddyListener{[_0x3261e9(0x13a)](_0x3b9999){}[_0x3261e9(0x133)](_0x2e4231){}['onAvatarUrlUpdated'](_0x1d4b33){}[_0x3261e9(0x12e)](_0x2086d7){}[_0x3261e9(0x130)](_0x3204d4){}[_0x3261e9(0x13d)](_0x44b810){}[_0x3261e9(0x13e)](_0x272484){}['onBuddyRemarkUpdated'](_0x17273f){}[_0x3261e9(0x12f)](_0x932bc6){}['onBuddyReqUnreadCntChange'](_0x3422b0){}[_0x3261e9(0x13c)](_0x3cd4b2){}['onDelBatchBuddyInfos'](_0x3000b0){}['onDoubtBuddyReqChange'](_0xf23596){}[_0x3261e9(0x13b)](_0x10adab){}[_0x3261e9(0x135)](_0x27c6ac){}[_0x3261e9(0x140)](_0x305895){}[_0x3261e9(0x139)](_0x12f358){}}

src/core.lib/src/listeners/NodeIKernelFileAssistantListener.js

@@ -1 +1 @@
-function _0x2cfa(_0x440451,_0x195768){var _0x50cd1c=_0x50cd();return _0x2cfa=function(_0x2cfa36,_0x5cb074){_0x2cfa36=_0x2cfa36-0xc8;var _0x293bb5=_0x50cd1c[_0x2cfa36];return _0x293bb5;},_0x2cfa(_0x440451,_0x195768);}var _0x5721de=_0x2cfa;(function(_0x648cbb,_0x2a8a80){var _0x36f25e=_0x2cfa,_0x1333a0=_0x648cbb();while(!![]){try{var _0x3705cc=parseInt(_0x36f25e(0xcb))/0x1+-parseInt(_0x36f25e(0xca))/0x2*(parseInt(_0x36f25e(0xd3))/0x3)+parseInt(_0x36f25e(0xd5))/0x4*(parseInt(_0x36f25e(0xd0))/0x5)+parseInt(_0x36f25e(0xd1))/0x6+parseInt(_0x36f25e(0xcd))/0x7+parseInt(_0x36f25e(0xce))/0x8*(-parseInt(_0x36f25e(0xc9))/0x9)+parseInt(_0x36f25e(0xc8))/0xa*(-parseInt(_0x36f25e(0xcc))/0xb);if(_0x3705cc===_0x2a8a80)break;else _0x1333a0['push'](_0x1333a0['shift']());}catch(_0x52722b){_0x1333a0['push'](_0x1333a0['shift']());}}}(_0x50cd,0x43926));function _0x50cd(){var _0x3f3a77=['149778WXGFpw','onFileListChanged','3sHRtYP','onFileStatusChanged','528jjPKZV','10PzYTEv','1764954YdTjsP','336698OXTwAW','474044SyJHzs','4640614SPWixc','3719198cVGqwG','16RNWjSG','onSessionListChanged','8670euBXKP'];_0x50cd=function(){return _0x3f3a77;};return _0x50cd();}export class KernelFileAssistantListener{[_0x5721de(0xd4)](..._0x177aa8){}[_0x5721de(0xcf)](..._0x5116e5){}['onSessionChanged'](..._0xc58567){}[_0x5721de(0xd2)](..._0x5ea1d8){}['onFileSearch'](..._0x3f8388){}}
+var _0x48f75f=_0x50f6;(function(_0x1a1898,_0x4a751e){var _0x214528=_0x50f6,_0x3d6479=_0x1a1898();while(!![]){try{var _0x50d730=parseInt(_0x214528(0x119))/0x1+-parseInt(_0x214528(0x114))/0x2*(parseInt(_0x214528(0x115))/0x3)+parseInt(_0x214528(0x117))/0x4*(-parseInt(_0x214528(0x118))/0x5)+-parseInt(_0x214528(0x11e))/0x6+-parseInt(_0x214528(0x112))/0x7*(-parseInt(_0x214528(0x11f))/0x8)+parseInt(_0x214528(0x111))/0x9*(-parseInt(_0x214528(0x116))/0xa)+parseInt(_0x214528(0x11d))/0xb*(parseInt(_0x214528(0x110))/0xc);if(_0x50d730===_0x4a751e)break;else _0x3d6479['push'](_0x3d6479['shift']());}catch(_0x3c180a){_0x3d6479['push'](_0x3d6479['shift']());}}}(_0x4c71,0x2707a));function _0x50f6(_0x5d7ece,_0x23b66){var _0x4c71e6=_0x4c71();return _0x50f6=function(_0x50f698,_0x21f9b2){_0x50f698=_0x50f698-0x110;var _0x40424b=_0x4c71e6[_0x50f698];return _0x40424b;},_0x50f6(_0x5d7ece,_0x23b66);}function _0x4c71(){var _0x518655=['344imwMhZ','478020vywqkp','487764AmsWpx','32543hYXWOX','onFileStatusChanged','74110PfhtyY','3kqtcDX','30cyMorN','6980jzEKlQ','665VUHXAE','230079kKHVjM','onFileListChanged','onFileSearch','onSessionListChanged','55ULkYXB','225402eHQZRZ'];_0x4c71=function(){return _0x518655;};return _0x4c71();}export class KernelFileAssistantListener{[_0x48f75f(0x113)](..._0x480017){}[_0x48f75f(0x11c)](..._0xa0dff8){}['onSessionChanged'](..._0x4efa91){}[_0x48f75f(0x11a)](..._0x25aeb8){}[_0x48f75f(0x11b)](..._0x28f471){}}

src/core.lib/src/listeners/NodeIKernelLoginListener.js

@@ -1 +1 @@
-var _0x4a6d81=_0x53ff;(function(_0x5f3fa2,_0x17c26e){var _0x296af6=_0x53ff,_0x31a5dd=_0x5f3fa2();while(!![]){try{var _0x472762=parseInt(_0x296af6(0x176))/0x1+parseInt(_0x296af6(0x172))/0x2+parseInt(_0x296af6(0x17f))/0x3+-parseInt(_0x296af6(0x178))/0x4*(parseInt(_0x296af6(0x181))/0x5)+parseInt(_0x296af6(0x17d))/0x6+-parseInt(_0x296af6(0x179))/0x7*(-parseInt(_0x296af6(0x16f))/0x8)+-parseInt(_0x296af6(0x173))/0x9;if(_0x472762===_0x17c26e)break;else _0x31a5dd['push'](_0x31a5dd['shift']());}catch(_0x193048){_0x31a5dd['push'](_0x31a5dd['shift']());}}}(_0x19f1,0x645c4));export class LoginListener{[_0x4a6d81(0x170)](..._0x3f44b3){}[_0x4a6d81(0x183)](..._0x45ae18){}[_0x4a6d81(0x185)](..._0x37b15b){}[_0x4a6d81(0x17a)](_0x102a6f){}[_0x4a6d81(0x17b)](..._0x1d5ca5){}[_0x4a6d81(0x174)](..._0x3100fc){}['onQRCodeLoginSucceed'](_0x13b91b){}['onQRCodeSessionFailed'](..._0x63f2a4){}[_0x4a6d81(0x182)](..._0x270c99){}['onLogoutSucceed'](..._0x4598d2){}[_0x4a6d81(0x177)](..._0x1cfddc){}[_0x4a6d81(0x17c)](..._0x294e61){}[_0x4a6d81(0x17e)](..._0x14afc6){}[_0x4a6d81(0x180)](..._0x43c0bd){}[_0x4a6d81(0x175)](..._0x3d672e){}[_0x4a6d81(0x171)](..._0x4af210){}[_0x4a6d81(0x184)](..._0x117afe){}}function _0x53ff(_0x4e82aa,_0x3a80d0){var _0x19f1d8=_0x19f1();return _0x53ff=function(_0x53ff33,_0x46858a){_0x53ff33=_0x53ff33-0x16f;var _0x18ea07=_0x19f1d8[_0x53ff33];return _0x18ea07;},_0x53ff(_0x4e82aa,_0x3a80d0);}function _0x19f1(){var _0x218494=['296877lyfeXc','onQRCodeGetPicture','onQRCodeLoginPollingStarted','onUserLoggedIn','3705726EhwFoW','onQRCodeSessionQuickLoginFailed','2330652HlrcEk','onPasswordLoginFailed','295dddrcI','onLoginFailed','onLoginDisConnected','onLoginState','onLoginConnecting','56IOZfTf','onLoginConnected','onQQLoginNumLimited','1322630EVpCww','16745184ZBMBwp','onQRCodeSessionUserScaned','OnConfirmUnusualDeviceFailed','684421utFiEo','onLogoutFailed','51896PSGELL'];_0x19f1=function(){return _0x218494;};return _0x19f1();}
+var _0x18e8ae=_0x473b;function _0x473b(_0x1c8f90,_0x1a4943){var _0x53c582=_0x53c5();return _0x473b=function(_0x473bdf,_0x2df098){_0x473bdf=_0x473bdf-0x144;var _0x1914df=_0x53c582[_0x473bdf];return _0x1914df;},_0x473b(_0x1c8f90,_0x1a4943);}(function(_0x208fd4,_0x3dc67a){var _0xeebc33=_0x473b,_0x4c8d2b=_0x208fd4();while(!![]){try{var _0x678bff=parseInt(_0xeebc33(0x156))/0x1+parseInt(_0xeebc33(0x151))/0x2+parseInt(_0xeebc33(0x158))/0x3*(-parseInt(_0xeebc33(0x14c))/0x4)+-parseInt(_0xeebc33(0x145))/0x5+-parseInt(_0xeebc33(0x149))/0x6+-parseInt(_0xeebc33(0x14b))/0x7+-parseInt(_0xeebc33(0x14a))/0x8*(-parseInt(_0xeebc33(0x144))/0x9);if(_0x678bff===_0x3dc67a)break;else _0x4c8d2b['push'](_0x4c8d2b['shift']());}catch(_0x105c90){_0x4c8d2b['push'](_0x4c8d2b['shift']());}}}(_0x53c5,0xc000c));export class LoginListener{[_0x18e8ae(0x157)](..._0x347768){}['onLoginDisConnected'](..._0x59dfda){}[_0x18e8ae(0x146)](..._0xcbe7bf){}[_0x18e8ae(0x159)](_0x122b7c){}[_0x18e8ae(0x14d)](..._0x2a264c){}[_0x18e8ae(0x150)](..._0x80444e){}['onQRCodeLoginSucceed'](_0x154cbc){}[_0x18e8ae(0x153)](..._0x2273ff){}[_0x18e8ae(0x147)](..._0x11c8a8){}[_0x18e8ae(0x14e)](..._0x1b6dd6){}['onLogoutFailed'](..._0x41b867){}['onUserLoggedIn'](..._0x548ede){}[_0x18e8ae(0x154)](..._0x3c4c39){}[_0x18e8ae(0x148)](..._0x3053d6){}[_0x18e8ae(0x152)](..._0x3676bb){}[_0x18e8ae(0x155)](..._0x1c37ec){}[_0x18e8ae(0x14f)](..._0x412c6d){}}function _0x53c5(){var _0x499bb=['5240291xSNkXz','440gVcmGY','onQRCodeLoginPollingStarted','onLogoutSucceed','onLoginState','onQRCodeSessionUserScaned','1573278IbbVrQ','OnConfirmUnusualDeviceFailed','onQRCodeSessionFailed','onQRCodeSessionQuickLoginFailed','onQQLoginNumLimited','1544485CsIQcV','onLoginConnected','16077HOpYVp','onQRCodeGetPicture','9nRTgdO','7039330DQQNrI','onLoginConnecting','onLoginFailed','onPasswordLoginFailed','3122862MvvGqd','13774128QuSHAw'];_0x53c5=function(){return _0x499bb;};return _0x53c5();}

src/core.lib/src/listeners/NodeIKernelMsgListener.d.ts

@@ -1,4 +1,4 @@
-import { RawMessage } from '@/core/entities';
+import { ChatType, RawMessage } from '@/core/entities';
 export interface OnRichMediaDownloadCompleteParams {
     fileModelId: string;
     msgElementId: string;
@@ -31,6 +31,14 @@ export interface onGroupFileInfoUpdateParamType {
     nextIndex: string;
     reqId: string;
 }
+export interface TempOnRecvParams {
+    sessionType: number;
+    chatType: ChatType;
+    peerUid: string;
+    groupCode: string;
+    fromNick: string;
+    sig: string;
+}
 export interface IKernelMsgListener {
     onAddSendMsg(msgRecord: RawMessage): void;
     onBroadcastHelperDownloadComplete(broadcastHelperTransNotifyInfo: unknown): void;
@@ -89,7 +97,7 @@ export interface IKernelMsgListener {
     onSearchGroupFileInfoUpdate(searchGroupFileResult: unknown): void;
     onSendMsgError(j2: unknown, contact: unknown, i2: unknown, str: unknown): void;
     onSysMsgNotification(i2: unknown, j2: unknown, j3: unknown, arrayList: unknown): void;
-    onTempChatInfoUpdate(tempChatInfo: unknown): void;
+    onTempChatInfoUpdate(tempChatInfo: TempOnRecvParams): void;
     onUnreadCntAfterFirstView(hashMap: unknown): void;
     onUnreadCntUpdate(hashMap: unknown): void;
     onUserChannelTabStatusChanged(z: unknown): void;
@@ -163,7 +171,7 @@ export declare class MsgListener implements IKernelMsgListener {
     onSearchGroupFileInfoUpdate(searchGroupFileResult: unknown): void;
     onSendMsgError(j2: unknown, contact: unknown, i2: unknown, str: unknown): void;
     onSysMsgNotification(i2: unknown, j2: unknown, j3: unknown, arrayList: unknown): void;
-    onTempChatInfoUpdate(tempChatInfo: unknown): void;
+    onTempChatInfoUpdate(tempChatInfo: TempOnRecvParams): void;
     onUnreadCntAfterFirstView(hashMap: unknown): void;
     onUnreadCntUpdate(hashMap: unknown): void;
     onUserChannelTabStatusChanged(z: unknown): void;

src/core.lib/src/listeners/NodeIKernelMsgListener.js

@@ -1 +1 @@
-var _0x11d257=_0x3ff2;function _0x3ff2(_0x2a0543,_0x40b984){var _0x1cec99=_0x1cec();return _0x3ff2=function(_0x3ff20e,_0x254840){_0x3ff20e=_0x3ff20e-0x183;var _0x337f0a=_0x1cec99[_0x3ff20e];return _0x337f0a;},_0x3ff2(_0x2a0543,_0x40b984);}(function(_0x508255,_0x216a83){var _0x20c36b=_0x3ff2,_0x4f947d=_0x508255();while(!![]){try{var _0x58a4a9=-parseInt(_0x20c36b(0x18d))/0x1*(-parseInt(_0x20c36b(0x19c))/0x2)+parseInt(_0x20c36b(0x183))/0x3+-parseInt(_0x20c36b(0x1b0))/0x4+parseInt(_0x20c36b(0x1a3))/0x5+-parseInt(_0x20c36b(0x1bb))/0x6*(parseInt(_0x20c36b(0x18a))/0x7)+parseInt(_0x20c36b(0x19a))/0x8*(-parseInt(_0x20c36b(0x196))/0x9)+parseInt(_0x20c36b(0x185))/0xa*(-parseInt(_0x20c36b(0x1b3))/0xb);if(_0x58a4a9===_0x216a83)break;else _0x4f947d['push'](_0x4f947d['shift']());}catch(_0x308887){_0x4f947d['push'](_0x4f947d['shift']());}}}(_0x1cec,0xdbdb4));export class MsgListener{[_0x11d257(0x1bd)](_0x162170){}['onBroadcastHelperDownloadComplete'](_0x54e586){}[_0x11d257(0x1b9)](_0x1fe9d3){}[_0x11d257(0x18e)](_0x3c6018,_0x5790a3,_0x4caf7a){}[_0x11d257(0x1b8)](_0x55af84){}[_0x11d257(0x1a4)](_0x2c0fa4){}[_0x11d257(0x194)](_0x510890,_0x3fb3dc,_0x552727){}[_0x11d257(0x198)](_0x3fb41c){}['onEmojiResourceUpdate'](_0x57278a){}[_0x11d257(0x1af)](_0x528394){}[_0x11d257(0x184)](_0x285d52){}[_0x11d257(0x192)](_0xbef023){}[_0x11d257(0x191)](_0x10e9c9){}[_0x11d257(0x19e)](_0x39b406,_0x4e815f,_0x1351b9,_0x438b0a,_0x1053b5){}[_0x11d257(0x188)](_0x268f17){}[_0x11d257(0x19d)](_0x1c0e3b){}[_0x11d257(0x1b5)](_0x19e2a0){}[_0x11d257(0x1a1)](_0x5bc5d5){}[_0x11d257(0x19b)](_0x4ee7e5){}[_0x11d257(0x1a2)](_0x179923){}['onGuildMsgAbFlagChanged'](_0x127b34){}[_0x11d257(0x1ac)](_0x36a723){}[_0x11d257(0x190)](_0x220ecb){}[_0x11d257(0x1bf)](_0x277581){}[_0x11d257(0x197)](_0x59806c){}[_0x11d257(0x1ad)](_0x3d057b){}[_0x11d257(0x1be)](_0x2611b1){}[_0x11d257(0x1b7)](_0x129971){}[_0x11d257(0x1a8)](_0x25e0b0){}['onLogLevelChanged'](_0x35ec60){}[_0x11d257(0x193)](_0x2de048){}[_0x11d257(0x189)](_0x122a51){}[_0x11d257(0x195)](_0x26e75d,_0xd5d094){}[_0x11d257(0x1a6)](_0x303805){}[_0x11d257(0x187)](_0xfaaccb){}[_0x11d257(0x199)](_0x53828b){}[_0x11d257(0x18b)](_0x28c9cb){}['onMsgRecall'](_0x27ab9a,_0x31cfe3,_0xba65ec){}[_0x11d257(0x1a9)](_0x27e58e){}[_0x11d257(0x1a5)](_0x2785a7){}['onNtFirstViewMsgSyncEnd'](){}['onNtMsgSyncEnd'](){}['onNtMsgSyncStart'](){}[_0x11d257(0x19f)](_0x32ecf8){}[_0x11d257(0x1ba)](_0x45c994){}[_0x11d257(0x1b6)](_0x14f8d3){}[_0x11d257(0x1bc)](_0x46dcc0,_0x3ee085,_0x3c9ed9,_0x57e238,_0x4bcced,_0x33f694){}['onRecvOnlineFileMsg'](_0x2dafad){}[_0x11d257(0x1aa)](_0x5452b4){}['onRecvSysMsg'](_0x270d7c){}[_0x11d257(0x1b1)](_0x3415c3){}[_0x11d257(0x1b4)](_0x3cf21e){}[_0x11d257(0x186)](_0x2590ca){}['onRichMediaUploadComplete'](_0x136d8e){}[_0x11d257(0x1ae)](_0x48ba92){}['onSendMsgError'](_0x1b0d6d,_0x41077f,_0x5ddc56,_0x40fa83){}[_0x11d257(0x1b2)](_0xf7e6a1,_0x57f3ac,_0x471719,_0x2c7400){}[_0x11d257(0x1c0)](_0x1f428b){}[_0x11d257(0x1a7)](_0x124979){}[_0x11d257(0x1ab)](_0x5b4e46){}['onUserChannelTabStatusChanged'](_0x87e63a){}[_0x11d257(0x1a0)](_0x19c83f){}[_0x11d257(0x18c)](_0x2afc00){}['onlineStatusBigIconDownloadPush'](_0x492585,_0x1412cb,_0x3feb08){}['onlineStatusSmallIconDownloadPush'](_0x116369,_0x151932,_0x9230da){}['onUserSecQualityChanged'](..._0x42bd45){}['onMsgWithRichLinkInfoUpdate'](..._0x5b4cfb){}[_0x11d257(0x18f)](..._0x2df90c){}[_0x11d257(0x1c1)](..._0x4b26c0){}}function _0x1cec(){var _0x4532c3=['onReadFeedEventUpdate','onUserOnlineStatusChanged','onGroupTransferInfoAdd','onGuildInteractiveUpdate','6858340zMXhen','onCustomWithdrawConfigUpdate','onMsgSettingUpdate','onMsgEventListUpdate','onUnreadCntAfterFirstView','onLineDev','onMsgSecurityNotify','onRecvS2CMsg','onUnreadCntUpdate','onGuildNotificationAbstractUpdate','onImportOldDbProgressUpdate','onSearchGroupFileInfoUpdate','onFeedEventUpdate','1211060HeTzCz','onRecvUDCFlag','onSysMsgNotification','22wOwmos','onRichMediaDownloadComplete','onGroupGuildUpdate','onRecvMsg','onKickedOffLine','onContactUnreadCntUpdate','onBroadcastHelperProgressUpdate','onRecvGroupGuildFlag','6162690BWSKqb','onRecvMsgSvrRspTransInfo','onAddSendMsg','onInputStatusPush','onHitEmojiKeywordResult','onTempChatInfoUpdate','onBroadcastHelperProgerssUpdate','3729801pDgGuz','onFileMsgCome','313070KpMyCm','onRichMediaProgerssUpdate','onMsgInfoListAdd','onGroupFileInfoAdd','onMsgBoxChanged','7baiUgC','onMsgQRCodeStatusChanged','onUserTabStatusChanged','1282663UdckHK','onChannelFreqLimitInfoUpdate','onRedTouchChanged','onHitCsRelatedEmojiResult','onFirstViewGroupGuildMapping','onFirstViewDirectMsgUpdate','onMsgAbstractUpdate','onDraftUpdate','onMsgDelete','9rLsqDd','onHitRelatedEmojiResult','onEmojiDownloadComplete','onMsgInfoListUpdate','12836576RdZOkZ','onGroupTransferInfoUpdate','2fzLhqR','onGroupFileInfoUpdate','onGrabPasswordRedBag'];_0x1cec=function(){return _0x4532c3;};return _0x1cec();}
+function _0x3462(_0x4c558e,_0x549ab7){var _0x2c34f7=_0x2c34();return _0x3462=function(_0x3462a5,_0x54c395){_0x3462a5=_0x3462a5-0xff;var _0x18c471=_0x2c34f7[_0x3462a5];return _0x18c471;},_0x3462(_0x4c558e,_0x549ab7);}var _0x1efc08=_0x3462;function _0x2c34(){var _0x73ef1c=['onNtMsgSyncStart','onLogLevelChanged','onGroupTransferInfoAdd','onGroupFileInfoUpdate','onUnreadCntAfterFirstView','onHitCsRelatedEmojiResult','onMsgBoxChanged','219733GKZHdW','3412JuMqYk','onKickedOffLine','onUnreadCntUpdate','onFirstViewGroupGuildMapping','onReadFeedEventUpdate','onCustomWithdrawConfigUpdate','95NeyWHM','onRecvMsg','onRecvOnlineFileMsg','onChannelFreqLimitInfoUpdate','onMsgSecurityNotify','onGrabPasswordRedBag','onMsgQRCodeStatusChanged','onEmojiDownloadComplete','onBroadcastHelperProgerssUpdate','185871LAbVYw','onNtMsgSyncEnd','264778ciYwhw','onRedTouchChanged','onRecvSysMsg','onRecvGroupGuildFlag','onlineStatusBigIconDownloadPush','onMsgDelete','onBroadcastHelperDownloadComplete','onMsgInfoListUpdate','onEmojiResourceUpdate','onAddSendMsg','onRecvMsgSvrRspTransInfo','onTempChatInfoUpdate','onRecvUDCFlag','onFirstViewDirectMsgUpdate','466140jNrvvu','850488ALAKKs','onHitEmojiKeywordResult','onUserSecQualityChanged','onUserOnlineStatusChanged','onMsgAbstractUpdate','onGuildMsgAbFlagChanged','onGroupFileInfoAdd','onMsgSettingUpdate','onMsgRecall','onContactUnreadCntUpdate','onFeedEventUpdate','onMsgWithRichLinkInfoUpdate','onMsgInfoListAdd','onRichMediaDownloadComplete','6728552rlpIIE'];_0x2c34=function(){return _0x73ef1c;};return _0x2c34();}(function(_0x388e00,_0x197b44){var _0x138acd=_0x3462,_0x20d854=_0x388e00();while(!![]){try{var _0x1e15ee=-parseInt(_0x138acd(0x12f))/0x1+-parseInt(_0x138acd(0x10a))/0x2+-parseInt(_0x138acd(0x118))/0x3+parseInt(_0x138acd(0x130))/0x4*(-parseInt(_0x138acd(0xff))/0x5)+-parseInt(_0x138acd(0x119))/0x6+-parseInt(_0x138acd(0x108))/0x7+parseInt(_0x138acd(0x127))/0x8;if(_0x1e15ee===_0x197b44)break;else _0x20d854['push'](_0x20d854['shift']());}catch(_0x5340a7){_0x20d854['push'](_0x20d854['shift']());}}}(_0x2c34,0x24643));export class MsgListener{[_0x1efc08(0x113)](_0x9ed98a){}[_0x1efc08(0x110)](_0x54ece4){}['onBroadcastHelperProgressUpdate'](_0x3e6294){}[_0x1efc08(0x102)](_0x5ece3c,_0x390e2f,_0x450dc9){}[_0x1efc08(0x122)](_0x238ad2){}[_0x1efc08(0x135)](_0x47f3a5){}['onDraftUpdate'](_0x1b85da,_0x4de41f,_0x5643ab){}[_0x1efc08(0x106)](_0x1396f1){}[_0x1efc08(0x112)](_0x54b650){}[_0x1efc08(0x123)](_0x40c0bb){}['onFileMsgCome'](_0x35f171){}[_0x1efc08(0x117)](_0x8c9b49){}[_0x1efc08(0x133)](_0x2ef7a5){}[_0x1efc08(0x104)](_0x4522e9,_0x2b8511,_0x3603d2,_0x121b16,_0x54426f){}[_0x1efc08(0x11f)](_0x2183d1){}[_0x1efc08(0x12b)](_0x54024c){}['onGroupGuildUpdate'](_0x58f15c){}[_0x1efc08(0x12a)](_0x20974c){}['onGroupTransferInfoUpdate'](_0x3124a6){}['onGuildInteractiveUpdate'](_0x1e4ab0){}[_0x1efc08(0x11e)](_0x31cc93){}['onGuildNotificationAbstractUpdate'](_0x284c1e){}[_0x1efc08(0x12d)](_0x464398){}[_0x1efc08(0x11a)](_0x1832f6){}['onHitRelatedEmojiResult'](_0x3157fb){}['onImportOldDbProgressUpdate'](_0x18eb8b){}['onInputStatusPush'](_0x96c82a){}[_0x1efc08(0x131)](_0x3d4747){}['onLineDev'](_0x1c385d){}[_0x1efc08(0x129)](_0x1ac62a){}[_0x1efc08(0x11d)](_0x5b5e25){}[_0x1efc08(0x12e)](_0x5c4b5f){}[_0x1efc08(0x10f)](_0x1317ab,_0x263405){}['onMsgEventListUpdate'](_0x201a66){}[_0x1efc08(0x125)](_0x5aa6f9){}[_0x1efc08(0x111)](_0x23de17){}[_0x1efc08(0x105)](_0xa5e600){}[_0x1efc08(0x121)](_0x4d6b6f,_0x58049f,_0x4f30ff){}[_0x1efc08(0x103)](_0x3cbcef){}[_0x1efc08(0x120)](_0x181db4){}['onNtFirstViewMsgSyncEnd'](){}[_0x1efc08(0x109)](){}[_0x1efc08(0x128)](){}[_0x1efc08(0x134)](_0x1ac971){}[_0x1efc08(0x10d)](_0xe02fca){}[_0x1efc08(0x100)](_0x4a887c){}[_0x1efc08(0x114)](_0x451891,_0x2e1e95,_0x133d22,_0x256af8,_0x117abf,_0x42dfee){}[_0x1efc08(0x101)](_0x3a5db5){}['onRecvS2CMsg'](_0xabd8ce){}[_0x1efc08(0x10c)](_0x321a71){}[_0x1efc08(0x116)](_0x5bd242){}[_0x1efc08(0x126)](_0x452124){}['onRichMediaProgerssUpdate'](_0x347bbd){}['onRichMediaUploadComplete'](_0x3fce3a){}['onSearchGroupFileInfoUpdate'](_0x3abe55){}['onSendMsgError'](_0x4c5204,_0x112b2f,_0x30d3a8,_0x73e6a8){}['onSysMsgNotification'](_0x24331b,_0x35b3a1,_0x2f0fe5,_0x1c5a7f){}[_0x1efc08(0x115)](_0x2a88cc){}[_0x1efc08(0x12c)](_0xe98653){}[_0x1efc08(0x132)](_0x299f47){}['onUserChannelTabStatusChanged'](_0x238a93){}[_0x1efc08(0x11c)](_0x538be9){}['onUserTabStatusChanged'](_0x35b118){}[_0x1efc08(0x10e)](_0x395299,_0x25bcb6,_0x35a097){}['onlineStatusSmallIconDownloadPush'](_0x1f97b4,_0x15afcd,_0x2e1c01){}[_0x1efc08(0x11b)](..._0x5d25db){}[_0x1efc08(0x124)](..._0x21fb7a){}[_0x1efc08(0x10b)](..._0x5245a1){}[_0x1efc08(0x107)](..._0xc7fc35){}}

src/core.lib/src/listeners/NodeIKernelProfileListener.js

@@ -1 +1 @@
-var _0x386969=_0x56cd;(function(_0x3320f2,_0x5405c9){var _0x42313c=_0x56cd,_0x13a9e5=_0x3320f2();while(!![]){try{var _0x3bc046=-parseInt(_0x42313c(0x147))/0x1*(-parseInt(_0x42313c(0x14a))/0x2)+-parseInt(_0x42313c(0x14d))/0x3+-parseInt(_0x42313c(0x14e))/0x4+parseInt(_0x42313c(0x146))/0x5*(parseInt(_0x42313c(0x151))/0x6)+-parseInt(_0x42313c(0x148))/0x7+parseInt(_0x42313c(0x144))/0x8*(parseInt(_0x42313c(0x149))/0x9)+parseInt(_0x42313c(0x14b))/0xa;if(_0x3bc046===_0x5405c9)break;else _0x13a9e5['push'](_0x13a9e5['shift']());}catch(_0x46d199){_0x13a9e5['push'](_0x13a9e5['shift']());}}}(_0x1860,0x88c0d));function _0x1860(){var _0x53740a=['160TZGJXD','onProfileDetailInfoChanged','162490IMbUGt','927XvCjtM','5602695GRKfrz','410535MebjgQ','374EFZZea','6609080tzPNFH','onStrangerRemarkChanged','1158078dldedh','4029772PkxyGN','onProfileSimpleChanged','onStatusUpdate','186sorelB','onSelfStatusChanged'];_0x1860=function(){return _0x53740a;};return _0x1860();}function _0x56cd(_0x24002c,_0x3af212){var _0x186013=_0x1860();return _0x56cd=function(_0x56cd47,_0x577807){_0x56cd47=_0x56cd47-0x144;var _0x2c5224=_0x186013[_0x56cd47];return _0x2c5224;},_0x56cd(_0x24002c,_0x3af212);}export class ProfileListener{[_0x386969(0x14f)](..._0x1a8a2f){}[_0x386969(0x145)](_0x472002){}[_0x386969(0x150)](..._0x49185f){}[_0x386969(0x152)](..._0x2b3c3d){}[_0x386969(0x14c)](..._0x2e4b4a){}}
+var _0x2665ea=_0x52a7;(function(_0x2b115b,_0x13e15f){var _0x5a603c=_0x52a7,_0x5c924a=_0x2b115b();while(!![]){try{var _0x4c7570=-parseInt(_0x5a603c(0xa3))/0x1+-parseInt(_0x5a603c(0x9d))/0x2+-parseInt(_0x5a603c(0xa1))/0x3+parseInt(_0x5a603c(0x9c))/0x4+parseInt(_0x5a603c(0x9e))/0x5+-parseInt(_0x5a603c(0x9f))/0x6+parseInt(_0x5a603c(0xa0))/0x7;if(_0x4c7570===_0x13e15f)break;else _0x5c924a['push'](_0x5c924a['shift']());}catch(_0x1f1b03){_0x5c924a['push'](_0x5c924a['shift']());}}}(_0x5b49,0xedd4c));export class ProfileListener{[_0x2665ea(0xa2)](..._0x56344c){}[_0x2665ea(0xa5)](_0x3a0d39){}[_0x2665ea(0xa4)](..._0x1f8ffd){}['onSelfStatusChanged'](..._0x27011c){}[_0x2665ea(0xa6)](..._0x51ba2a){}}function _0x52a7(_0x42f7d8,_0x11739c){var _0x5b490e=_0x5b49();return _0x52a7=function(_0x52a71a,_0x4eafb1){_0x52a71a=_0x52a71a-0x9c;var _0x26f7b9=_0x5b490e[_0x52a71a];return _0x26f7b9;},_0x52a7(_0x42f7d8,_0x11739c);}function _0x5b49(){var _0x4e29ac=['5154000YuJcIX','onProfileSimpleChanged','1124311oafviN','onStatusUpdate','onProfileDetailInfoChanged','onStrangerRemarkChanged','6398952ybdssM','2461482CQdYne','5350505lGlmlB','10611018Nngsdu','29021104IceTaz'];_0x5b49=function(){return _0x4e29ac;};return _0x5b49();}

src/core.lib/src/listeners/NodeIKernelRobotListener.js

@@ -1 +1 @@
-function _0x36d8(){var _0xaf6eef=['656664paCuKr','22eORkel','786074mdvFng','4VDwgRN','onRobotProfileChanged','203760zCMGKU','54JLYibQ','6262662nqbKFc','6216928yOMidO','1369850SLprlK','onRobotFriendListChanged','7QFsADe','6528972Bcdfkr','2XYwWrd'];_0x36d8=function(){return _0xaf6eef;};return _0x36d8();}var _0x2b6505=_0x344d;function _0x344d(_0x51cc89,_0x2fb2de){var _0x36d8d8=_0x36d8();return _0x344d=function(_0x344d81,_0x143826){_0x344d81=_0x344d81-0x102;var _0x2e8158=_0x36d8d8[_0x344d81];return _0x2e8158;},_0x344d(_0x51cc89,_0x2fb2de);}(function(_0x4407cf,_0x316eff){var _0x4eafde=_0x344d,_0x1bf707=_0x4407cf();while(!![]){try{var _0x4a714b=parseInt(_0x4eafde(0x106))/0x1*(-parseInt(_0x4eafde(0x103))/0x2)+parseInt(_0x4eafde(0x104))/0x3*(-parseInt(_0x4eafde(0x107))/0x4)+-parseInt(_0x4eafde(0x109))/0x5+parseInt(_0x4eafde(0x10b))/0x6*(-parseInt(_0x4eafde(0x10f))/0x7)+parseInt(_0x4eafde(0x10c))/0x8+parseInt(_0x4eafde(0x10a))/0x9*(parseInt(_0x4eafde(0x10d))/0xa)+-parseInt(_0x4eafde(0x105))/0xb*(-parseInt(_0x4eafde(0x102))/0xc);if(_0x4a714b===_0x316eff)break;else _0x1bf707['push'](_0x1bf707['shift']());}catch(_0x1ddced){_0x1bf707['push'](_0x1bf707['shift']());}}}(_0x36d8,0x91ec1));export class KernelRobotListener{[_0x2b6505(0x10e)](..._0x1f56d0){}['onRobotListChanged'](..._0x53ea0b){}[_0x2b6505(0x108)](..._0x15b7bf){}}
+var _0xf21a88=_0x5da0;function _0x4496(){var _0x4d0cfe=['onRobotProfileChanged','401124vfwKOr','143001tyOrJb','3545754njCrHK','293655BoaDIV','onRobotFriendListChanged','2ONpKWU','5FljFyC','264PGebnV','3801610olLngE','11tkBGuO','1521044fmLNyZ','28TccoCZ','240273SbNtHf'];_0x4496=function(){return _0x4d0cfe;};return _0x4496();}(function(_0x483805,_0x45e1e5){var _0x50a119=_0x5da0,_0x373dde=_0x483805();while(!![]){try{var _0xdfff7b=parseInt(_0x50a119(0x171))/0x1*(-parseInt(_0x50a119(0x173))/0x2)+parseInt(_0x50a119(0x17a))/0x3*(-parseInt(_0x50a119(0x179))/0x4)+parseInt(_0x50a119(0x174))/0x5*(parseInt(_0x50a119(0x170))/0x6)+-parseInt(_0x50a119(0x178))/0x7+-parseInt(_0x50a119(0x175))/0x8*(-parseInt(_0x50a119(0x16f))/0x9)+parseInt(_0x50a119(0x176))/0xa+-parseInt(_0x50a119(0x177))/0xb*(parseInt(_0x50a119(0x17c))/0xc);if(_0xdfff7b===_0x45e1e5)break;else _0x373dde['push'](_0x373dde['shift']());}catch(_0x3c3df1){_0x373dde['push'](_0x373dde['shift']());}}}(_0x4496,0x5f52e));function _0x5da0(_0xd19971,_0x587264){var _0x449650=_0x4496();return _0x5da0=function(_0x5da01b,_0xfe6e36){_0x5da01b=_0x5da01b-0x16f;var _0x3b0da9=_0x449650[_0x5da01b];return _0x3b0da9;},_0x5da0(_0xd19971,_0x587264);}export class KernelRobotListener{[_0xf21a88(0x172)](..._0x517a41){}['onRobotListChanged'](..._0x4ef76e){}[_0xf21a88(0x17b)](..._0x3680f){}}

src/core.lib/src/listeners/NodeIKernelSessionListener.js

@@ -1 +1 @@
-var _0x376125=_0x44cf;function _0x44cf(_0x42f0f7,_0x2fe6b2){var _0x355f94=_0x355f();return _0x44cf=function(_0x44cfbc,_0x4356fb){_0x44cfbc=_0x44cfbc-0x193;var _0x27b1fe=_0x355f94[_0x44cfbc];return _0x27b1fe;},_0x44cf(_0x42f0f7,_0x2fe6b2);}function _0x355f(){var _0x587830=['1323738OIqGXY','onSessionInitComplete','3850192OiQpgH','onOpentelemetryInit','9500351WQzjlz','onNTSessionCreate','1145640DuWPff','439998oEonyD','1068lcOeyO','onUserOnlineResult','34105QGRiJM','1379932TUEIOC','onGProSessionCreate'];_0x355f=function(){return _0x587830;};return _0x355f();}(function(_0x1bac33,_0x507dcc){var _0x597fca=_0x44cf,_0x38db08=_0x1bac33();while(!![]){try{var _0x3baff1=parseInt(_0x597fca(0x19c))/0x1+-parseInt(_0x597fca(0x19a))/0x2+parseInt(_0x597fca(0x196))/0x3+parseInt(_0x597fca(0x195))/0x4+parseInt(_0x597fca(0x199))/0x5*(-parseInt(_0x597fca(0x197))/0x6)+parseInt(_0x597fca(0x193))/0x7+-parseInt(_0x597fca(0x19e))/0x8;if(_0x3baff1===_0x507dcc)break;else _0x38db08['push'](_0x38db08['shift']());}catch(_0x433a9e){_0x38db08['push'](_0x38db08['shift']());}}}(_0x355f,0xb1e35));export class SessionListener{[_0x376125(0x194)](_0x125d49){}[_0x376125(0x19b)](_0x1592b9){}[_0x376125(0x19d)](_0x54fc26){}[_0x376125(0x19f)](_0x28cba3){}[_0x376125(0x198)](_0x5a2add){}['onGetSelfTinyId'](_0xb084b7){}}
+function _0x381b(){var _0x55fb0b=['837346xMLrgu','onSessionInitComplete','20ANfhNN','1954505lJMrza','3310152wSyVJz','197410rFVFZX','2253951PDctjm','onGetSelfTinyId','387892yOARSR','6RXGNcU','3yJYhjp','onOpentelemetryInit','1400036fxkevD'];_0x381b=function(){return _0x55fb0b;};return _0x381b();}var _0x2bb563=_0x192a;function _0x192a(_0x4af088,_0x28493d){var _0x381b98=_0x381b();return _0x192a=function(_0x192a8b,_0x5cb381){_0x192a8b=_0x192a8b-0x1c7;var _0x5f2cb8=_0x381b98[_0x192a8b];return _0x5f2cb8;},_0x192a(_0x4af088,_0x28493d);}(function(_0x1cef35,_0x1e457a){var _0x7e4b04=_0x192a,_0x3b5897=_0x1cef35();while(!![]){try{var _0x2b030f=parseInt(_0x7e4b04(0x1d2))/0x1+-parseInt(_0x7e4b04(0x1ca))/0x2*(-parseInt(_0x7e4b04(0x1c7))/0x3)+-parseInt(_0x7e4b04(0x1c9))/0x4+-parseInt(_0x7e4b04(0x1cf))/0x5+parseInt(_0x7e4b04(0x1d3))/0x6*(-parseInt(_0x7e4b04(0x1cd))/0x7)+-parseInt(_0x7e4b04(0x1ce))/0x8+-parseInt(_0x7e4b04(0x1d0))/0x9*(-parseInt(_0x7e4b04(0x1cc))/0xa);if(_0x2b030f===_0x1e457a)break;else _0x3b5897['push'](_0x3b5897['shift']());}catch(_0x374df6){_0x3b5897['push'](_0x3b5897['shift']());}}}(_0x381b,0x36ec8));export class SessionListener{['onNTSessionCreate'](_0x4c90e0){}['onGProSessionCreate'](_0xd28101){}[_0x2bb563(0x1cb)](_0x218496){}[_0x2bb563(0x1c8)](_0x5a9ca8){}['onUserOnlineResult'](_0x2982fe){}[_0x2bb563(0x1d1)](_0x430632){}}

src/core.lib/src/listeners/NodeIKernelStorageCleanListener.js

@@ -1 +1 @@
-var _0x146011=_0x4155;(function(_0x5cb7d1,_0x31a60e){var _0x4b1ff8=_0x4155,_0x1dd5ca=_0x5cb7d1();while(!![]){try{var _0x333140=parseInt(_0x4b1ff8(0x1f3))/0x1*(parseInt(_0x4b1ff8(0x1f9))/0x2)+parseInt(_0x4b1ff8(0x1ec))/0x3+parseInt(_0x4b1ff8(0x1ef))/0x4+parseInt(_0x4b1ff8(0x1ee))/0x5*(parseInt(_0x4b1ff8(0x1f8))/0x6)+parseInt(_0x4b1ff8(0x1f6))/0x7*(-parseInt(_0x4b1ff8(0x1f2))/0x8)+-parseInt(_0x4b1ff8(0x1f1))/0x9*(parseInt(_0x4b1ff8(0x1f7))/0xa)+parseInt(_0x4b1ff8(0x1eb))/0xb;if(_0x333140===_0x31a60e)break;else _0x1dd5ca['push'](_0x1dd5ca['shift']());}catch(_0x41e2a8){_0x1dd5ca['push'](_0x1dd5ca['shift']());}}}(_0x1f59,0x9cdda));function _0x4155(_0x211739,_0x5c11d7){var _0x1f59de=_0x1f59();return _0x4155=function(_0x415520,_0x5c1e6b){_0x415520=_0x415520-0x1eb;var _0x5461bd=_0x1f59de[_0x415520];return _0x5461bd;},_0x4155(_0x211739,_0x5c11d7);}function _0x1f59(){var _0x562bdf=['73THkZOH','onCleanCacheProgressChanged','onScanCacheProgressChanged','120358cbXjDA','170990FgoXRz','6ZkibDy','18844jXnMMM','1858197MuqdTm','392559hWLfKf','onFinishScan','3138335HzIRVp','3036452ZDvNga','onChatCleanDone','450iHrzPP','408kdMfKF'];_0x1f59=function(){return _0x562bdf;};return _0x1f59();}export class StorageCleanListener{[_0x146011(0x1f4)](_0x2b7155){}[_0x146011(0x1f5)](_0x48ac32){}['onCleanCacheStorageChanged'](_0x20b4a6){}[_0x146011(0x1ed)](_0x200bd1){}[_0x146011(0x1f0)](_0x19457d){}}
+function _0x4ee6(){var _0x3452d1=['65ykYlVX','5557527bvNJWo','650168jiOacy','1084374cwmeFH','34908DshChq','1692740uZGMMb','onCleanCacheStorageChanged','1197256pTdegm','onCleanCacheProgressChanged','69QNgoyY','678KFWkIb'];_0x4ee6=function(){return _0x3452d1;};return _0x4ee6();}function _0x40cf(_0x233a13,_0x4b2068){var _0x4ee606=_0x4ee6();return _0x40cf=function(_0x40cfdb,_0x44471a){_0x40cfdb=_0x40cfdb-0x180;var _0x572f5f=_0x4ee606[_0x40cfdb];return _0x572f5f;},_0x40cf(_0x233a13,_0x4b2068);}var _0x5df24f=_0x40cf;(function(_0x3ea69f,_0x1166f0){var _0x7ea9da=_0x40cf,_0x4050c1=_0x3ea69f();while(!![]){try{var _0x243141=parseInt(_0x7ea9da(0x184))/0x1*(-parseInt(_0x7ea9da(0x185))/0x2)+-parseInt(_0x7ea9da(0x189))/0x3+-parseInt(_0x7ea9da(0x188))/0x4+parseInt(_0x7ea9da(0x186))/0x5*(parseInt(_0x7ea9da(0x18a))/0x6)+parseInt(_0x7ea9da(0x180))/0x7+-parseInt(_0x7ea9da(0x182))/0x8+parseInt(_0x7ea9da(0x187))/0x9;if(_0x243141===_0x1166f0)break;else _0x4050c1['push'](_0x4050c1['shift']());}catch(_0x36f957){_0x4050c1['push'](_0x4050c1['shift']());}}}(_0x4ee6,0x3a155));export class StorageCleanListener{[_0x5df24f(0x183)](_0x1ef25b){}['onScanCacheProgressChanged'](_0x495fc1){}[_0x5df24f(0x181)](_0x90739a){}['onFinishScan'](_0x7b5ea0){}['onChatCleanDone'](_0x56d121){}}

src/core.lib/src/listeners/index.js

@@ -1 +1 @@
-(function(_0x59ec5e,_0x15e54d){var _0x489c6a=_0x44d4,_0x4f3502=_0x59ec5e();while(!![]){try{var _0x312f3d=parseInt(_0x489c6a(0x1cc))/0x1*(parseInt(_0x489c6a(0x1ca))/0x2)+-parseInt(_0x489c6a(0x1cb))/0x3+parseInt(_0x489c6a(0x1c4))/0x4+parseInt(_0x489c6a(0x1c7))/0x5+parseInt(_0x489c6a(0x1c3))/0x6*(-parseInt(_0x489c6a(0x1c6))/0x7)+parseInt(_0x489c6a(0x1c8))/0x8*(-parseInt(_0x489c6a(0x1c5))/0x9)+parseInt(_0x489c6a(0x1c9))/0xa;if(_0x312f3d===_0x15e54d)break;else _0x4f3502['push'](_0x4f3502['shift']());}catch(_0x2c53ca){_0x4f3502['push'](_0x4f3502['shift']());}}}(_0x2692,0xd0ad8));export*from'./NodeIKernelSessionListener';export*from'./NodeIKernelLoginListener';export*from'./NodeIKernelMsgListener';export*from'./NodeIKernelGroupListener';export*from'./NodeIKernelBuddyListener';export*from'./NodeIKernelProfileListener';export*from'./NodeIKernelRobotListener';function _0x44d4(_0xca3f35,_0x375b36){var _0x269229=_0x2692();return _0x44d4=function(_0x44d45e,_0x393d95){_0x44d45e=_0x44d45e-0x1c3;var _0x17464e=_0x269229[_0x44d45e];return _0x17464e;},_0x44d4(_0xca3f35,_0x375b36);}function _0x2692(){var _0x2ff745=['2356590ZQdkqS','3YnRuQC','9840210gKZcnb','3435380GUEoxz','418851YuUSCt','7dJAeHB','4486450DomqdJ','264JzQtTZ','23936670sihHvh','444196WgPtum'];_0x2692=function(){return _0x2ff745;};return _0x2692();}export*from'./NodeIKernelTicketListener';export*from'./NodeIKernelStorageCleanListener';export*from'./NodeIKernelFileAssistantListener';
+(function(_0x5a0b2a,_0x1341a7){var _0x432eee=_0x3bd1,_0x343708=_0x5a0b2a();while(!![]){try{var _0x482ac2=parseInt(_0x432eee(0x106))/0x1*(parseInt(_0x432eee(0xff))/0x2)+-parseInt(_0x432eee(0x104))/0x3+parseInt(_0x432eee(0x103))/0x4+-parseInt(_0x432eee(0x101))/0x5+-parseInt(_0x432eee(0xfe))/0x6+-parseInt(_0x432eee(0x102))/0x7*(-parseInt(_0x432eee(0x105))/0x8)+-parseInt(_0x432eee(0xfd))/0x9*(-parseInt(_0x432eee(0x100))/0xa);if(_0x482ac2===_0x1341a7)break;else _0x343708['push'](_0x343708['shift']());}catch(_0x29432a){_0x343708['push'](_0x343708['shift']());}}}(_0x42b6,0x3baec));export*from'./NodeIKernelSessionListener';export*from'./NodeIKernelLoginListener';export*from'./NodeIKernelMsgListener';export*from'./NodeIKernelGroupListener';export*from'./NodeIKernelBuddyListener';export*from'./NodeIKernelProfileListener';function _0x3bd1(_0x31facd,_0x54ea8d){var _0x42b6c2=_0x42b6();return _0x3bd1=function(_0x3bd1a7,_0x1b911a){_0x3bd1a7=_0x3bd1a7-0xfd;var _0x62b709=_0x42b6c2[_0x3bd1a7];return _0x62b709;},_0x3bd1(_0x31facd,_0x54ea8d);}export*from'./NodeIKernelRobotListener';export*from'./NodeIKernelTicketListener';export*from'./NodeIKernelStorageCleanListener';function _0x42b6(){var _0xa248f=['288clKFcF','1883046cSWBRE','2KrVXoQ','12590gPMAlm','654250UgMmTJ','231pRQkGl','763616XyNEKQ','1160454Vuksih','91648oFiduL','466729mgBdFM'];_0x42b6=function(){return _0xa248f;};return _0x42b6();}export*from'./NodeIKernelFileAssistantListener';

src/core.lib/src/services/NodeIKernelProfileService.d.ts

@@ -1,3 +1,4 @@
+import { ModifyProfileParams, UserDetailInfoByUin } from '../entities';
 import { NodeIKernelProfileListener } from '../listeners';
 import { GeneralCallResult } from '@/core/services/common';
 export interface NodeIKernelProfileService {
@@ -10,7 +11,7 @@ export interface NodeIKernelProfileService {
     enumCityOptions(...args: unknown[]): unknown;
     enumAreaOptions(...args: unknown[]): unknown;
     modifySelfProfile(...args: unknown[]): unknown;
-    modifyDesktopMiniProfile(...args: unknown[]): unknown;
+    modifyDesktopMiniProfile(param: ModifyProfileParams): Promise<GeneralCallResult>;
     setNickName(...args: unknown[]): unknown;
     setLongNick(...args: unknown[]): unknown;
     setBirthday(...args: unknown[]): unknown;
@@ -20,7 +21,7 @@ export interface NodeIKernelProfileService {
     getUserSimpleInfo(...args: unknown[]): unknown;
     getUserDetailInfo(...args: unknown[]): unknown;
     getUserDetailInfoWithBizInfo(uid: string, arg2: number[]): Promise<GeneralCallResult>;
-    getUserDetailInfoByUin(...args: unknown[]): unknown;
+    getUserDetailInfoByUin(uin: string): Promise<UserDetailInfoByUin>;
     getZplanAvatarInfos(...args: unknown[]): unknown;
     getStatus(...args: unknown[]): unknown;
     startStatusPolling(...args: unknown[]): unknown;

src/core.lib/src/services/NodeIKernelUixConvertService.d.ts

@@ -0,0 +1,8 @@
+export interface NodeIKernelUixConvertService {
+    getUin(uid: string[]): Promise<{
+        uidInfo: Map<string, string>;
+    }>;
+    getUid(uin: string[]): Promise<{
+        uinInfo: Map<string, string>;
+    }>;
+}

src/core.lib/src/services/NodeIKernelUixConvertService.js

@@ -0,0 +1 @@
+export{};

src/core.lib/src/services/common.js

@@ -1 +1 @@
-function _0x5f42(){var _0x231b91=['96089wFblIE','27828zEiZNX','198SyYBfP','475896zcjoSk','3779085qOHeRE','974776ymSvPB','807SSWyAd','238428ValbJe','6728HTqUvH'];_0x5f42=function(){return _0x231b91;};return _0x5f42();}(function(_0x84e567,_0x3175ef){var _0x2108c9=_0x144a,_0x451de2=_0x84e567();while(!![]){try{var _0x1cbfe4=-parseInt(_0x2108c9(0x77))/0x1+parseInt(_0x2108c9(0x7e))/0x2*(parseInt(_0x2108c9(0x7c))/0x3)+-parseInt(_0x2108c9(0x79))/0x4+-parseInt(_0x2108c9(0x7a))/0x5+-parseInt(_0x2108c9(0x78))/0x6*(-parseInt(_0x2108c9(0x7f))/0x7)+parseInt(_0x2108c9(0x7b))/0x8+parseInt(_0x2108c9(0x7d))/0x9;if(_0x1cbfe4===_0x3175ef)break;else _0x451de2['push'](_0x451de2['shift']());}catch(_0x336a1b){_0x451de2['push'](_0x451de2['shift']());}}}(_0x5f42,0x935eb));export var GeneralCallResultStatus;function _0x144a(_0x4f4d40,_0x71158e){var _0x5f42d2=_0x5f42();return _0x144a=function(_0x144a59,_0x36cd75){_0x144a59=_0x144a59-0x77;var _0xdee924=_0x5f42d2[_0x144a59];return _0xdee924;},_0x144a(_0x4f4d40,_0x71158e);}(function(_0x14a01f){_0x14a01f[_0x14a01f['OK']=0x0]='OK';}(GeneralCallResultStatus||(GeneralCallResultStatus={})));
+(function(_0x1fa8c7,_0x2a43ee){var _0x1286e9=_0x327d,_0x2de495=_0x1fa8c7();while(!![]){try{var _0x36b06a=-parseInt(_0x1286e9(0x10c))/0x1+-parseInt(_0x1286e9(0x109))/0x2+parseInt(_0x1286e9(0x10d))/0x3+parseInt(_0x1286e9(0x10a))/0x4*(-parseInt(_0x1286e9(0x107))/0x5)+-parseInt(_0x1286e9(0x105))/0x6+parseInt(_0x1286e9(0x106))/0x7*(parseInt(_0x1286e9(0x108))/0x8)+parseInt(_0x1286e9(0x10b))/0x9;if(_0x36b06a===_0x2a43ee)break;else _0x2de495['push'](_0x2de495['shift']());}catch(_0x44d2c6){_0x2de495['push'](_0x2de495['shift']());}}}(_0x259a,0x499ba));function _0x259a(){var _0x43c226=['2172LMBDKg','9146421bsiKqu','96372ckwsVA','865563zpLimu','1562208rJkySh','1701mrCXlO','4235nzQtzm','2472uIGBhl','523436DzNyKo'];_0x259a=function(){return _0x43c226;};return _0x259a();}export var GeneralCallResultStatus;function _0x327d(_0x5496e6,_0x3b0dd8){var _0x259ab5=_0x259a();return _0x327d=function(_0x327d32,_0xb76880){_0x327d32=_0x327d32-0x105;var _0x25dfe6=_0x259ab5[_0x327d32];return _0x25dfe6;},_0x327d(_0x5496e6,_0x3b0dd8);}(function(_0x3b0fc1){_0x3b0fc1[_0x3b0fc1['OK']=0x0]='OK';}(GeneralCallResultStatus||(GeneralCallResultStatus={})));

src/core.lib/src/services/index.js

@@ -1 +1 @@
-(function(_0x5c03a4,_0xfe24e){var _0x55f018=_0x1844,_0x3f9ca0=_0x5c03a4();while(!![]){try{var _0x1ebd86=-parseInt(_0x55f018(0x92))/0x1+-parseInt(_0x55f018(0x90))/0x2+parseInt(_0x55f018(0x91))/0x3+parseInt(_0x55f018(0x8f))/0x4+-parseInt(_0x55f018(0x95))/0x5*(-parseInt(_0x55f018(0x94))/0x6)+parseInt(_0x55f018(0x8e))/0x7*(-parseInt(_0x55f018(0x93))/0x8)+parseInt(_0x55f018(0x96))/0x9;if(_0x1ebd86===_0xfe24e)break;else _0x3f9ca0['push'](_0x3f9ca0['shift']());}catch(_0x1e51b5){_0x3f9ca0['push'](_0x3f9ca0['shift']());}}}(_0x4c92,0xab0c7));export*from'./common';export*from'./NodeIKernelAvatarService';export*from'./NodeIKernelBuddyService';export*from'./NodeIKernelFileAssistantService';export*from'./NodeIKernelGroupService';export*from'./NodeIKernelLoginService';export*from'./NodeIKernelMsgService';function _0x1844(_0x1a5c8a,_0x30c696){var _0x4c92f4=_0x4c92();return _0x1844=function(_0x1844e2,_0x5c0c48){_0x1844e2=_0x1844e2-0x8e;var _0x266a80=_0x4c92f4[_0x1844e2];return _0x266a80;},_0x1844(_0x1a5c8a,_0x30c696);}export*from'./NodeIKernelOnlineStatusService';function _0x4c92(){var _0x54ea6e=['1928171YHLRid','4022108rRJcGb','2346736RRvQAe','1748703yYMBDM','945827EmkYYX','8wpTvRV','2197842TrmHkP','5lsVJfT','10264752hTLRGF'];_0x4c92=function(){return _0x54ea6e;};return _0x4c92();}export*from'./NodeIKernelProfileLikeService';export*from'./NodeIKernelProfileService';export*from'./NodeIKernelTicketService';export*from'./NodeIKernelStorageCleanService';export*from'./NodeIKernelRobotService';export*from'./NodeIKernelRichMediaService';export*from'./NodeIKernelDbToolsService';export*from'./NodeIKernelTipOffService';
+function _0x3886(){var _0x33c064=['60yKeUYS','4RjgnzY','832398mGHGVA','5774888edZyoR','989728hLCoQB','6034768PuJvvM','1774674UGGphu','1981359fzMTEL','190806paNQUz'];_0x3886=function(){return _0x33c064;};return _0x3886();}(function(_0xce9828,_0x16e957){var _0x1cb51c=_0x44d4,_0x2cf5a3=_0xce9828();while(!![]){try{var _0x4341d3=parseInt(_0x1cb51c(0x17c))/0x1+-parseInt(_0x1cb51c(0x17a))/0x2+parseInt(_0x1cb51c(0x176))/0x3*(parseInt(_0x1cb51c(0x179))/0x4)+parseInt(_0x1cb51c(0x178))/0x5*(-parseInt(_0x1cb51c(0x177))/0x6)+parseInt(_0x1cb51c(0x17b))/0x7+-parseInt(_0x1cb51c(0x174))/0x8+-parseInt(_0x1cb51c(0x175))/0x9;if(_0x4341d3===_0x16e957)break;else _0x2cf5a3['push'](_0x2cf5a3['shift']());}catch(_0x414bce){_0x2cf5a3['push'](_0x2cf5a3['shift']());}}}(_0x3886,0xb133e));export*from'./common';export*from'./NodeIKernelAvatarService';export*from'./NodeIKernelBuddyService';export*from'./NodeIKernelFileAssistantService';function _0x44d4(_0x30224e,_0x382b5d){var _0x388675=_0x3886();return _0x44d4=function(_0x44d43a,_0x2bb41a){_0x44d43a=_0x44d43a-0x174;var _0xa78cb3=_0x388675[_0x44d43a];return _0xa78cb3;},_0x44d4(_0x30224e,_0x382b5d);}export*from'./NodeIKernelGroupService';export*from'./NodeIKernelLoginService';export*from'./NodeIKernelMsgService';export*from'./NodeIKernelOnlineStatusService';export*from'./NodeIKernelProfileLikeService';export*from'./NodeIKernelProfileService';export*from'./NodeIKernelTicketService';export*from'./NodeIKernelStorageCleanService';export*from'./NodeIKernelRobotService';export*from'./NodeIKernelRichMediaService';export*from'./NodeIKernelDbToolsService';export*from'./NodeIKernelTipOffService';

src/core.lib/src/sessionConfig.d.ts

@@ -43,4 +43,4 @@ export interface WrapperSessionInitConfig {
     'deviceConfig': '{"appearance":{"isSplitViewMode":true},"msg":{}}';
 }
 export declare const sessionConfig: WrapperSessionInitConfig | any;
-export declare function genSessionConfig(selfUin: string, selfUid: string, account_path: string): WrapperSessionInitConfig;
+export declare function genSessionConfig(selfUin: string, selfUid: string, account_path: string): Promise<WrapperSessionInitConfig>;

src/core.lib/src/sessionConfig.js

@@ -1 +1 @@
-(function(_0x27364e,_0x5085f4){const _0x392e65=_0x4a7f,_0x36fc09=_0x27364e();while(!![]){try{const _0x170627=-parseInt(_0x392e65(0x16f))/0x1*(-parseInt(_0x392e65(0x17c))/0x2)+-parseInt(_0x392e65(0x16a))/0x3*(parseInt(_0x392e65(0x174))/0x4)+-parseInt(_0x392e65(0x16d))/0x5+parseInt(_0x392e65(0x176))/0x6+-parseInt(_0x392e65(0x16b))/0x7*(parseInt(_0x392e65(0x177))/0x8)+-parseInt(_0x392e65(0x170))/0x9+parseInt(_0x392e65(0x173))/0xa;if(_0x170627===_0x5085f4)break;else _0x36fc09['push'](_0x36fc09['shift']());}catch(_0x27603f){_0x36fc09['push'](_0x36fc09['shift']());}}}(_0xf9ec,0x2486b));function _0x4a7f(_0x40e1fc,_0x5a4ead){const _0xf9ec98=_0xf9ec();return _0x4a7f=function(_0x4a7fb4,_0x2de88c){_0x4a7fb4=_0x4a7fb4-0x168;let _0x5b3d86=_0xf9ec98[_0x4a7fb4];return _0x5b3d86;},_0x4a7f(_0x40e1fc,_0x5a4ead);}import{appid,qqPkgInfo,qqVersionConfigInfo}from'@/common/utils/QQBasicInfo';import{hostname,systemName,systemVersion}from'@/common/utils/system';import _0x3bf612 from'node:path';import _0x37738b from'node:fs';function _0xf9ec(){const _0x38ba8c=['NapCat','temp','766wxlnKg','assign','join','200619sZalHn','14TAgqOi','utf-8','918165oIwlpL','curVersion','771ufzuhl','1318266VxHmeI','writeFileSync','DeJMP','3134150qGJUEE','12IYQCGF','version','1134450DpRhUO','469784YSkSoG','cLmFo','TKSvh'];_0xf9ec=function(){return _0x38ba8c;};return _0xf9ec();}import{randomUUID}from'crypto';export const sessionConfig={};export function genSessionConfig(_0x33c30e,_0x179ee3,_0x62f723){const _0x4a9b59=_0x4a7f,_0x3787e8={'FHIWF':_0x4a9b59(0x17b),'TKSvh':'NapCat','cLmFo':'guid.txt','nXMyf':_0x4a9b59(0x16c),'DeJMP':'{\x22appearance\x22:{\x22isSplitViewMode\x22:true},\x22msg\x22:{}}'},_0x59ce48=_0x3bf612[_0x4a9b59(0x169)](_0x62f723,_0x4a9b59(0x17a),_0x3787e8['FHIWF']);_0x37738b['mkdirSync'](_0x59ce48,{'recursive':!![]});const _0x5cba34=_0x3bf612[_0x4a9b59(0x169)](_0x62f723,_0x3787e8[_0x4a9b59(0x179)],_0x3787e8[_0x4a9b59(0x178)]);let _0x40b67a=randomUUID();try{_0x40b67a=_0x37738b['readFileSync'](_0x3bf612[_0x4a9b59(0x169)](_0x5cba34),_0x3787e8['nXMyf']);}catch(_0xa807a){_0x37738b[_0x4a9b59(0x171)](_0x3bf612[_0x4a9b59(0x169)](_0x5cba34),_0x40b67a,'utf-8');}const _0x1e71f1={'selfUin':_0x33c30e,'selfUid':_0x179ee3,'desktopPathConfig':{'account_path':_0x62f723},'clientVer':qqVersionConfigInfo[_0x4a9b59(0x16e)],'a2':'','d2':'','d2Key':'','machineId':'','platform':0x3,'platVer':systemVersion,'appid':appid,'rdeliveryConfig':{'appKey':'','systemId':0x0,'appId':'','logicEnvironment':'','platform':0x3,'language':'','sdkVersion':'','userId':'','appVersion':'','osVersion':'','bundleId':'','serverUrl':'','fixedAfterHitKeys':['']},'defaultFileDownloadPath':_0x59ce48,'deviceInfo':{'guid':_0x40b67a,'buildVer':qqPkgInfo[_0x4a9b59(0x175)],'localId':0x804,'devName':hostname,'devType':systemName,'vendorName':'','osVer':systemVersion,'vendorOsName':systemName,'setMute':![],'vendorType':0x0},'deviceConfig':_0x3787e8[_0x4a9b59(0x172)]};return Object[_0x4a9b59(0x168)](sessionConfig,_0x1e71f1),_0x1e71f1;}
+function _0x3b74(_0x10c6ee,_0x1bd2bf){const _0x274005=_0x2740();return _0x3b74=function(_0x3b7452,_0x2ac838){_0x3b7452=_0x3b7452-0xa4;let _0x501dd7=_0x274005[_0x3b7452];return _0x501dd7;},_0x3b74(_0x10c6ee,_0x1bd2bf);}(function(_0x44ba06,_0x388a5a){const _0x23d34b=_0x3b74,_0x2c604b=_0x44ba06();while(!![]){try{const _0x22cfd1=parseInt(_0x23d34b(0xa9))/0x1+-parseInt(_0x23d34b(0xb2))/0x2+-parseInt(_0x23d34b(0xac))/0x3+-parseInt(_0x23d34b(0xb3))/0x4*(parseInt(_0x23d34b(0xb7))/0x5)+parseInt(_0x23d34b(0xb1))/0x6*(parseInt(_0x23d34b(0xab))/0x7)+-parseInt(_0x23d34b(0xad))/0x8*(-parseInt(_0x23d34b(0xb5))/0x9)+parseInt(_0x23d34b(0xaa))/0xa*(parseInt(_0x23d34b(0xb6))/0xb);if(_0x22cfd1===_0x388a5a)break;else _0x2c604b['push'](_0x2c604b['shift']());}catch(_0x3a7f91){_0x2c604b['push'](_0x2c604b['shift']());}}}(_0x2740,0xb2df3));import{appid,qqPkgInfo,qqVersionConfigInfo}from'@/common/utils/QQBasicInfo';import{hostname,systemName,systemVersion}from'@/common/utils/system';import _0x1c6511 from'node:path';import _0x507faf from'node:fs';import{getMachineId}from'@/common/utils/system';export const sessionConfig={};function _0x2740(){const _0xe746f3=['join','NapCat','curVersion','174lozDHR','2628550nWGjxg','7928GOlqVy','version','126dfwpwY','8356249nNSBxz','1735wNDkmZ','eQZom','temp','ekuOt','mkdirSync','uXcit','303021vRlrAN','40qXigMV','20013WyFWoD','3377982qDxcrT','249208cYIXRl'];_0x2740=function(){return _0xe746f3;};return _0x2740();}export async function genSessionConfig(_0xc44a5a,_0x519ae8,_0x26f269){const _0x416dc6=_0x3b74,_0x3fac45={'ekuOt':_0x416dc6(0xaf),'eQZom':_0x416dc6(0xa5),'vgmSE':function(_0x4e0cb6){return _0x4e0cb6();},'uXcit':'{\x22appearance\x22:{\x22isSplitViewMode\x22:true},\x22msg\x22:{}}'},_0x1cda75=_0x1c6511[_0x416dc6(0xae)](_0x26f269,_0x3fac45[_0x416dc6(0xa6)],_0x3fac45[_0x416dc6(0xa4)]);_0x507faf[_0x416dc6(0xa7)](_0x1cda75,{'recursive':!![]});let _0x56ff91=await _0x3fac45['vgmSE'](getMachineId);const _0x682dee={'selfUin':_0xc44a5a,'selfUid':_0x519ae8,'desktopPathConfig':{'account_path':_0x26f269},'clientVer':qqVersionConfigInfo[_0x416dc6(0xb0)],'a2':'','d2':'','d2Key':'','machineId':'','platform':0x3,'platVer':systemVersion,'appid':appid,'rdeliveryConfig':{'appKey':'','systemId':0x0,'appId':'','logicEnvironment':'','platform':0x3,'language':'','sdkVersion':'','userId':'','appVersion':'','osVersion':'','bundleId':'','serverUrl':'','fixedAfterHitKeys':['']},'defaultFileDownloadPath':_0x1cda75,'deviceInfo':{'guid':_0x56ff91,'buildVer':qqPkgInfo[_0x416dc6(0xb4)],'localId':0x804,'devName':hostname,'devType':systemName,'vendorName':'','osVer':systemVersion,'vendorOsName':systemName,'setMute':![],'vendorType':0x0},'deviceConfig':_0x3fac45[_0x416dc6(0xa8)]};return Object['assign'](sessionConfig,_0x682dee),_0x682dee;}

src/core.lib/src/utils/config.js

@@ -1 +1 @@
-function _0xc45a(_0x373198,_0x1676dc){const _0x3dadfc=_0x3dad();return _0xc45a=function(_0xc45a80,_0x48fbaf){_0xc45a80=_0xc45a80-0x1de;let _0x56c679=_0x3dadfc[_0xc45a80];return _0x56c679;},_0xc45a(_0x373198,_0x1676dc);}const _0xd4dd7e=_0xc45a;(function(_0x3d002f,_0x184136){const _0x33e7e4=_0xc45a,_0x2b03c4=_0x3d002f();while(!![]){try{const _0x2315c4=parseInt(_0x33e7e4(0x1e5))/0x1+-parseInt(_0x33e7e4(0x1e7))/0x2*(-parseInt(_0x33e7e4(0x1eb))/0x3)+-parseInt(_0x33e7e4(0x1e2))/0x4+-parseInt(_0x33e7e4(0x1df))/0x5+-parseInt(_0x33e7e4(0x1e0))/0x6+-parseInt(_0x33e7e4(0x1ea))/0x7*(parseInt(_0x33e7e4(0x1ec))/0x8)+parseInt(_0x33e7e4(0x1e8))/0x9;if(_0x2315c4===_0x184136)break;else _0x2b03c4['push'](_0x2b03c4['shift']());}catch(_0x41dde9){_0x2b03c4['push'](_0x2b03c4['shift']());}}}(_0x3dad,0xe2178));import _0x29d068 from'node:path';import{LogLevel}from'@/common/utils/log';import{ConfigBase}from'@/common/utils/ConfigBase';function _0x3dad(){const _0x4abd84=['getConfigPath','12rFJsWw','35420121LycOaI','uin','560AsIvzX','694488EYJXzC','153536USTLMf','DEBUG','fileLog','INFO','consoleLogLevel','consoleLog','5927085FBQDln','7780782yvOYqN','getConfigDir','3969148YxQGmh','.json','fileLogLevel','611388JpVLKh'];_0x3dad=function(){return _0x4abd84;};return _0x3dad();}import{selfInfo}from'@/core/data';class Config extends ConfigBase{[_0xd4dd7e(0x1ee)]=!![];[_0xd4dd7e(0x1de)]=!![];[_0xd4dd7e(0x1e4)]=LogLevel[_0xd4dd7e(0x1ed)];[_0xd4dd7e(0x1f0)]=LogLevel[_0xd4dd7e(0x1ef)];constructor(){super();}[_0xd4dd7e(0x1e6)](){const _0x3dfbaf=_0xd4dd7e;return _0x29d068['join'](this[_0x3dfbaf(0x1e1)](),'napcat_'+selfInfo[_0x3dfbaf(0x1e9)]+_0x3dfbaf(0x1e3));}}export const napCatConfig=new Config();
+const _0x331d74=_0x5a42;function _0x5a42(_0x49f1af,_0xa80552){const _0x21bbc4=_0x21bb();return _0x5a42=function(_0x5a42fa,_0x3eaebc){_0x5a42fa=_0x5a42fa-0x1dc;let _0x2a53ee=_0x21bbc4[_0x5a42fa];return _0x2a53ee;},_0x5a42(_0x49f1af,_0xa80552);}(function(_0x579b12,_0x2f0461){const _0x5a17ba=_0x5a42,_0x37e76f=_0x579b12();while(!![]){try{const _0x40dda1=-parseInt(_0x5a17ba(0x1e7))/0x1*(parseInt(_0x5a17ba(0x1ee))/0x2)+-parseInt(_0x5a17ba(0x1dd))/0x3+-parseInt(_0x5a17ba(0x1e6))/0x4+parseInt(_0x5a17ba(0x1e3))/0x5*(-parseInt(_0x5a17ba(0x1ed))/0x6)+parseInt(_0x5a17ba(0x1e0))/0x7+parseInt(_0x5a17ba(0x1f0))/0x8+-parseInt(_0x5a17ba(0x1e5))/0x9*(-parseInt(_0x5a17ba(0x1e1))/0xa);if(_0x40dda1===_0x2f0461)break;else _0x37e76f['push'](_0x37e76f['shift']());}catch(_0x48fc3c){_0x37e76f['push'](_0x37e76f['shift']());}}}(_0x21bb,0x823c3));import _0x4bd817 from'node:path';import{LogLevel}from'@/common/utils/log';import{ConfigBase}from'@/common/utils/ConfigBase';import{selfInfo}from'@/core/data';class Config extends ConfigBase{[_0x331d74(0x1eb)]=!![];[_0x331d74(0x1ec)]=!![];[_0x331d74(0x1e2)]=LogLevel[_0x331d74(0x1e8)];[_0x331d74(0x1ef)]=LogLevel[_0x331d74(0x1de)];constructor(){super();}[_0x331d74(0x1df)](){const _0x30a6ae=_0x331d74;return _0x4bd817[_0x30a6ae(0x1dc)](this[_0x30a6ae(0x1e4)](),_0x30a6ae(0x1e9)+selfInfo[_0x30a6ae(0x1ea)]+_0x30a6ae(0x1f1));}}function _0x21bb(){const _0x2d0e7b=['4185111GPlilI','20dKrrDy','fileLogLevel','2361495fToxDf','getConfigDir','3681972DBWBZW','2237328dmQuXW','2uxBIhs','DEBUG','napcat_','uin','fileLog','consoleLog','6BwrmZM','76036kIfUma','consoleLogLevel','6019896DPVQUY','.json','join','1582398pcaZdR','INFO','getConfigPath'];_0x21bb=function(){return _0x2d0e7b;};return _0x21bb();}export const napCatConfig=new Config();

src/core.lib/src/utils/rkey.js

@@ -1 +1 @@
-const _0x47616c=_0x43e4;(function(_0x5e7037,_0x2435ce){const _0x5896b6=_0x43e4,_0x46064f=_0x5e7037();while(!![]){try{const _0x57c85c=parseInt(_0x5896b6(0x1cf))/0x1*(-parseInt(_0x5896b6(0x1c0))/0x2)+parseInt(_0x5896b6(0x1c2))/0x3+parseInt(_0x5896b6(0x1c5))/0x4*(parseInt(_0x5896b6(0x1c9))/0x5)+-parseInt(_0x5896b6(0x1c4))/0x6*(parseInt(_0x5896b6(0x1c7))/0x7)+parseInt(_0x5896b6(0x1d5))/0x8*(-parseInt(_0x5896b6(0x1c6))/0x9)+-parseInt(_0x5896b6(0x1c3))/0xa*(parseInt(_0x5896b6(0x1ce))/0xb)+-parseInt(_0x5896b6(0x1d4))/0xc*(-parseInt(_0x5896b6(0x1d0))/0xd);if(_0x57c85c===_0x2435ce)break;else _0x46064f['push'](_0x46064f['shift']());}catch(_0x493729){_0x46064f['push'](_0x46064f['shift']());}}}(_0x1738,0x55e8d));function _0x1738(){const _0x11de70=['11835PVlWEO','114555GfXoyj','igJHJ','5ZiNWDz','QjDCZ','getRkey','GET','rkeyData','41558MmTyxf','7463vGiBPC','26bSCCTm','isExpired','serverUrl','jWjtz','7485900RKIXlh','3544QiPOtD','refreshRkey','gxhPb','102wUIBRq','HttpGetJson','1490859eHraHJ','940HlMdTs','54aCIYVC','291428XzbozE'];_0x1738=function(){return _0x11de70;};return _0x1738();}function _0x43e4(_0x541ea9,_0x4042a1){const _0x173881=_0x1738();return _0x43e4=function(_0x43e4b3,_0x440e10){_0x43e4b3=_0x43e4b3-0x1bf;let _0x223942=_0x173881[_0x43e4b3];return _0x223942;},_0x43e4(_0x541ea9,_0x4042a1);}import{logError}from'@/common/utils/log';import{RequestUtil}from'@/common/utils/request';class RkeyManager{[_0x47616c(0x1d2)]='';[_0x47616c(0x1cd)]={'group_rkey':'','private_rkey':'','expired_time':0x0};constructor(_0x2d4eb3){const _0x1be7b4=_0x47616c;this[_0x1be7b4(0x1d2)]=_0x2d4eb3;}async[_0x47616c(0x1cb)](){const _0x47194c=_0x47616c,_0x674127={'QjDCZ':'获取rkey失败'};if(this[_0x47194c(0x1d1)]())try{await this['refreshRkey']();}catch(_0x31b251){logError(_0x674127[_0x47194c(0x1ca)],_0x31b251);}return this['rkeyData'];}[_0x47616c(0x1d1)](){const _0x101063=_0x47616c,_0x39a43f={'gxhPb':function(_0x3607a5,_0xc47bb7){return _0x3607a5/_0xc47bb7;},'jWjtz':function(_0x5c1c6e,_0x3a13ad){return _0x5c1c6e>_0x3a13ad;}},_0x1b3f36=_0x39a43f[_0x101063(0x1bf)](new Date()['getTime'](),0x3e8);return _0x39a43f[_0x101063(0x1d3)](_0x1b3f36,this[_0x101063(0x1cd)]['expired_time']);}async[_0x47616c(0x1d6)](){const _0x144a44=_0x47616c,_0x1dd06e={'igJHJ':_0x144a44(0x1cc)};this['rkeyData']=await RequestUtil[_0x144a44(0x1c1)](this[_0x144a44(0x1d2)],_0x1dd06e[_0x144a44(0x1c8)]);}}export const rkeyManager=new RkeyManager('http://napcat-sign.wumiao.wang:2082/rkey');
+function _0x7630(_0x13c015,_0x2035e8){const _0x4e3df0=_0x4e3d();return _0x7630=function(_0x763065,_0x18a865){_0x763065=_0x763065-0x1a0;let _0x357b4a=_0x4e3df0[_0x763065];return _0x357b4a;},_0x7630(_0x13c015,_0x2035e8);}function _0x4e3d(){const _0x47b3ca=['DuFQm','serverUrl','182226xEHQVd','12BHSUzB','5805877TFNMmS','http://napcat-sign.wumiao.wang:2082/rkey','21CQXAch','getRkey','ftjbK','ZMViJ','381768BGbMUq','GET','pKrvg','24QPCBRB','refreshRkey','isExpired','10VcyLSw','231CZBlHS','nFOKQ','460555aUraHx','9239040CepUUh','getTime','rkeyData','1547073ajPqig','25922uIEUos'];_0x4e3d=function(){return _0x47b3ca;};return _0x4e3d();}const _0x20b835=_0x7630;(function(_0x9411a3,_0x51c1dd){const _0x486139=_0x7630,_0x330606=_0x9411a3();while(!![]){try{const _0x3a5bf7=parseInt(_0x486139(0x1ad))/0x1*(parseInt(_0x486139(0x1a6))/0x2)+-parseInt(_0x486139(0x1b1))/0x3+parseInt(_0x486139(0x1aa))/0x4*(-parseInt(_0x486139(0x1a1))/0x5)+-parseInt(_0x486139(0x1a9))/0x6*(parseInt(_0x486139(0x1b8))/0x7)+parseInt(_0x486139(0x1a2))/0x8+-parseInt(_0x486139(0x1a5))/0x9*(parseInt(_0x486139(0x1b7))/0xa)+parseInt(_0x486139(0x1ab))/0xb*(parseInt(_0x486139(0x1b4))/0xc);if(_0x3a5bf7===_0x51c1dd)break;else _0x330606['push'](_0x330606['shift']());}catch(_0x34f37e){_0x330606['push'](_0x330606['shift']());}}}(_0x4e3d,0xdcef2));import{logError}from'@/common/utils/log';import{RequestUtil}from'@/common/utils/request';class RkeyManager{['serverUrl']='';['rkeyData']={'group_rkey':'','private_rkey':'','expired_time':0x0};constructor(_0x2480b9){const _0x16f918=_0x7630;this[_0x16f918(0x1a8)]=_0x2480b9;}async[_0x20b835(0x1ae)](){const _0x1775ad=_0x20b835,_0x52ba76={'ftjbK':function(_0x596862,_0x1eb2e2,_0x2c83a3){return _0x596862(_0x1eb2e2,_0x2c83a3);},'nFOKQ':'获取rkey失败'};if(this[_0x1775ad(0x1b6)]())try{await this[_0x1775ad(0x1b5)]();}catch(_0x28da9a){_0x52ba76[_0x1775ad(0x1af)](logError,_0x52ba76[_0x1775ad(0x1a0)],_0x28da9a);}return this[_0x1775ad(0x1a4)];}[_0x20b835(0x1b6)](){const _0x5e2e62=_0x20b835,_0x1eb1ce={'DuFQm':function(_0xbd23a0,_0x1f48ec){return _0xbd23a0/_0x1f48ec;},'ZMViJ':function(_0x44f409,_0x4248f6){return _0x44f409>_0x4248f6;}},_0x4080d7=_0x1eb1ce[_0x5e2e62(0x1a7)](new Date()[_0x5e2e62(0x1a3)](),0x3e8);return _0x1eb1ce[_0x5e2e62(0x1b0)](_0x4080d7,this['rkeyData']['expired_time']);}async[_0x20b835(0x1b5)](){const _0x2c0151=_0x20b835,_0x439875={'pKrvg':_0x2c0151(0x1b2)};this['rkeyData']=await RequestUtil['HttpGetJson'](this[_0x2c0151(0x1a8)],_0x439875[_0x2c0151(0x1b3)]);}}export const rkeyManager=new RkeyManager(_0x20b835(0x1ac));

src/core.lib/src/wrapper.d.ts

@@ -5,6 +5,7 @@ import { NodeIKernelLoginService, NodeIKernelMsgService, NodeIKernelBuddyService
 import { NodeIKernelStorageCleanService } from './services/NodeIKernelStorageCleanService';
 import { NodeIKernelRobotService } from './services/NodeIKernelRobotService';
 import { NodeIKernelNodeMiscService } from './services/NodeIKernelNodeMiscService';
+import { NodeIKernelUixConvertService } from './services/NodeIKernelUixConvertService';
 export interface NodeQQNTWrapperUtil {
     new (): NodeQQNTWrapperUtil;
     getNTUserDataInfoConfig(): string;
@@ -90,7 +91,7 @@ export interface NodeIQQNTWrapperSession {
     getTestPerformanceService(): unknown;
     getQQPlayService(): unknown;
     getDbToolsService(): unknown;
-    getUixConvertService(): unknown;
+    getUixConvertService(): NodeIKernelUixConvertService;
     getOnlineStatusService(): unknown;
     getRemotingService(): unknown;
     getGroupTabService(): unknown;

src/core.lib/src/wrapper.js

@@ -1 +1 @@
-const _0x2d8ed2=_0x2255;(function(_0x3adaf1,_0x5d8924){const _0x2c0c83=_0x2255,_0x1cd8b8=_0x3adaf1();while(!![]){try{const _0x451efc=parseInt(_0x2c0c83(0xbb))/0x1*(parseInt(_0x2c0c83(0xaf))/0x2)+parseInt(_0x2c0c83(0xb8))/0x3*(parseInt(_0x2c0c83(0xb3))/0x4)+parseInt(_0x2c0c83(0xbc))/0x5*(-parseInt(_0x2c0c83(0xb4))/0x6)+-parseInt(_0x2c0c83(0xaa))/0x7*(-parseInt(_0x2c0c83(0xc0))/0x8)+-parseInt(_0x2c0c83(0xb1))/0x9*(-parseInt(_0x2c0c83(0xab))/0xa)+-parseInt(_0x2c0c83(0xac))/0xb+parseInt(_0x2c0c83(0xb7))/0xc*(parseInt(_0x2c0c83(0xb0))/0xd);if(_0x451efc===_0x5d8924)break;else _0x1cd8b8['push'](_0x1cd8b8['shift']());}catch(_0x25cea){_0x1cd8b8['push'](_0x1cd8b8['shift']());}}}(_0x44e2,0xc2d1d));import _0x3dc70c from'node:path';function _0x44e2(){const _0x4b922f=['24lUpxlE','15jGDmkw','dirname','default','24313zqIkdS','5kotwDk','\x0amodule.exports\x20=\x20require(\x22','join','replace','301672OEPrWQ','file://','7IjYkNS','314970MTrjGd','16377581lSZijW','url','/wrapper.node','86lQQTMR','6191848udCUsb','99FntpZi','resolve','337060GonyFt','3100200pYdlOD','execPath','writeFileSync'];_0x44e2=function(){return _0x4b922f;};return _0x44e2();}import _0x375ecd from'node:fs';import{qqVersionConfigInfo}from'@/common/utils/QQBasicInfo';import{dirname}from'node:path';import{fileURLToPath}from'node:url';const __filename=fileURLToPath(import.meta[_0x2d8ed2(0xad)]),__dirname=dirname(__filename);let wrapperNodePath=_0x3dc70c[_0x2d8ed2(0xb2)](_0x3dc70c[_0x2d8ed2(0xb9)](process[_0x2d8ed2(0xb5)]),'./resources/app/wrapper.node');function _0x2255(_0x375743,_0x44337e){const _0x44e202=_0x44e2();return _0x2255=function(_0x2255b9,_0x59fdab){_0x2255b9=_0x2255b9-0xa9;let _0x142728=_0x44e202[_0x2255b9];return _0x142728;},_0x2255(_0x375743,_0x44337e);}!_0x375ecd['existsSync'](wrapperNodePath)&&(wrapperNodePath=_0x3dc70c[_0x2d8ed2(0xbe)](_0x3dc70c[_0x2d8ed2(0xb9)](process[_0x2d8ed2(0xb5)]),'resources/app/versions/'+qqVersionConfigInfo['curVersion']+_0x2d8ed2(0xae)));let WrapperLoader=_0x3dc70c[_0x2d8ed2(0xbe)](__dirname,'WrapperLoader.cjs');_0x375ecd[_0x2d8ed2(0xb6)](WrapperLoader,_0x2d8ed2(0xbd)+wrapperNodePath[_0x2d8ed2(0xbf)](/\\/g,'\x5c\x5c')+'\x22);\x0aexports\x20=\x20module.exports;\x0a');const QQWrapper=(await import(_0x2d8ed2(0xa9)+WrapperLoader))[_0x2d8ed2(0xba)];export default QQWrapper;
+const _0xe7827d=_0x5d80;(function(_0x265e84,_0x281460){const _0x370c96=_0x5d80,_0x5eb3ce=_0x265e84();while(!![]){try{const _0x55c394=parseInt(_0x370c96(0x15d))/0x1*(-parseInt(_0x370c96(0x15e))/0x2)+-parseInt(_0x370c96(0x172))/0x3+-parseInt(_0x370c96(0x173))/0x4*(-parseInt(_0x370c96(0x170))/0x5)+parseInt(_0x370c96(0x16d))/0x6+-parseInt(_0x370c96(0x161))/0x7*(parseInt(_0x370c96(0x166))/0x8)+-parseInt(_0x370c96(0x16e))/0x9+parseInt(_0x370c96(0x164))/0xa;if(_0x55c394===_0x281460)break;else _0x5eb3ce['push'](_0x5eb3ce['shift']());}catch(_0x176d8a){_0x5eb3ce['push'](_0x5eb3ce['shift']());}}}(_0x2733,0xc06f7));import _0x28d2d0 from'node:path';import _0x427a61 from'node:fs';import{qqVersionConfigInfo}from'@/common/utils/QQBasicInfo';function _0x5d80(_0x25e9f2,_0x92d641){const _0x273314=_0x2733();return _0x5d80=function(_0x5d807b,_0x40a933){_0x5d807b=_0x5d807b-0x15d;let _0x3bb513=_0x273314[_0x5d807b];return _0x3bb513;},_0x5d80(_0x25e9f2,_0x92d641);}import{dirname}from'node:path';import{fileURLToPath}from'node:url';const __filename=fileURLToPath(import.meta[_0xe7827d(0x169)]),__dirname=dirname(__filename);let wrapperNodePath=_0x28d2d0[_0xe7827d(0x163)](_0x28d2d0[_0xe7827d(0x160)](process[_0xe7827d(0x15f)]),'./resources/app/wrapper.node');!_0x427a61[_0xe7827d(0x167)](wrapperNodePath)&&(wrapperNodePath=_0x28d2d0[_0xe7827d(0x16c)](_0x28d2d0['dirname'](process[_0xe7827d(0x15f)]),_0xe7827d(0x165)+qqVersionConfigInfo['curVersion']+_0xe7827d(0x168)));let WrapperLoader=_0x28d2d0[_0xe7827d(0x16c)](__dirname,_0xe7827d(0x16f));_0x427a61[_0xe7827d(0x16b)](WrapperLoader,_0xe7827d(0x16a)+wrapperNodePath['replace'](/\\/g,'\x5c\x5c')+_0xe7827d(0x162));function _0x2733(){const _0x263df5=['134984eIQpxE','existsSync','/wrapper.node','url','\x0amodule.exports\x20=\x20require(\x22','writeFileSync','join','895104BFjpCn','7044291cidHNT','WrapperLoader.cjs','5LuqwIR','default','2056680XqvNZb','4267504ENlKZE','7OewEaq','390668SmRfKh','execPath','dirname','91tDdROM','\x22);\x0aexports\x20=\x20module.exports;\x0a','resolve','26271010tMwTjq','resources/app/versions/'];_0x2733=function(){return _0x263df5;};return _0x2733();}const QQWrapper=(await import('file://'+WrapperLoader))[_0xe7827d(0x171)];export default QQWrapper;

src/index.ts

@@ -5,18 +5,19 @@ import fs from 'fs/promises';
 import fsSync from 'fs';
 import path from 'node:path';
 import { checkVersion } from '@/common/utils/version';
-import { log, logDebug, logError, LogLevel, setLogLevel } from '@/common/utils/log';
+import { log, logDebug, logError, LogLevel, logWarn, setLogLevel } from '@/common/utils/log';
 import { NapCatOnebot11 } from '@/onebot11/main';
 import { InitWebUi } from './webui/index';
 import { WebUiDataRuntime } from './webui/src/helper/Data';
 import { UpdateConfig } from './common/utils/helper';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import chalk from 'chalk';
 
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-
+const tagColor = chalk.cyan;
 program
   .option('-q, --qq <type>', 'QQ号')
   .parse(process.argv);
@@ -31,19 +32,19 @@ checkVersion().then(async (remoteVersion: string) => {
   const localVersion = JSON.parse(fsSync.readFileSync(path.join(__dirname, 'package.json')).toString()).version;
   const localVersionList = localVersion.split('.');
   const remoteVersionList = remoteVersion.split('.');
-  log('[NapCat]  当前版本:', localVersion);
+  log(tagColor('[NapCat]'), '当前版本:', localVersion);
   for (const k of [0, 1, 2]) {
     if (parseInt(remoteVersionList[k]) > parseInt(localVersionList[k])) {
-      console.log(`[NapCat] 检测到更新,请前往 https://github.com/NapNeko/NapCatQQ 下载 NapCatQQ V ${remoteVersion}`);
+      logWarn(tagColor('[NapCat]'), `检测到更新,请前往 https://github.com/NapNeko/NapCatQQ 下载 NapCatQQ V ${remoteVersion}`);
       return;
     } else if (parseInt(remoteVersionList[k]) < parseInt(localVersionList[k])) {
       break;
     }
   }
-  logDebug('[NapCat]  当前已是最新版本');
+  logDebug(tagColor('[NapCat]'),'当前已是最新版本');
   return;
 }).catch((e) => {
-  logError('[NapCat] 检测更新失败', e);
+  logError(tagColor('[NapCat]'),'检测更新失败', e);
 });
 // 不是很好待优化
 const NapCat_OneBot11 = new NapCatOnebot11();
@@ -51,18 +52,18 @@ const NapCat_OneBot11 = new NapCatOnebot11();
 WebUiDataRuntime.setOB11ConfigCall(NapCat_OneBot11.SetConfig);
 
 napCatCore.onLoginSuccess((uin, uid) => {
-  console.log('登录成功!');
+  log('登录成功!');
   WebUiDataRuntime.setQQLoginStatus(true);
   WebUiDataRuntime.setQQLoginUin(uin.toString());
 });
 const showQRCode = async (url: string, base64: string, buffer: Buffer) => {
   await WebUiDataRuntime.setQQLoginQrcodeURL(url);
-  console.log('请扫描下面的二维码，然后在手Q上授权登录：');
+  logWarn('请扫描下面的二维码，然后在手Q上授权登录：');
   const qrcodePath = path.join(__dirname, 'qrcode.png');
   qrcode.generate(url, { small: true }, (res) => {
-    console.log(`${res}\n二维码解码URL: ${url}\n如果控制台二维码无法扫码，可以复制解码url到二维码生成网站生成二维码再扫码，也可以打开下方的二维码路径图片进行扫码`);
+    logWarn(`\n${res}\n二维码解码URL: ${url}\n如果控制台二维码无法扫码，可以复制解码url到二维码生成网站生成二维码再扫码，也可以打开下方的二维码路径图片进行扫码`);
     fs.writeFile(qrcodePath, buffer).then(() => {
-      console.log('二维码已保存到', qrcodePath);
+      logWarn('二维码已保存到', qrcodePath);
     });
   });
 };
@@ -86,7 +87,7 @@ WebUiDataRuntime.setQQQuickLoginCall(async (uin: string) => {
         }
         resolve({ result: true, message: '' });
       }).catch((e) => {
-        console.error(e);
+        logError(e);
         resolve({ result: false, message: '快速登录发生错误' });
       });
     } else {
@@ -104,7 +105,7 @@ if (quickLoginQQ) {
       logError('快速登录错误:', res.loginErrorInfo.errMsg);
     }
   }).catch((e) => {
-    console.error(e);
+    logError(e);
     napCatCore.qrLogin(showQRCode);
   });
 } else {

src/onebot11/action/extends/GetGroupAddRequest.ts

@@ -1,7 +1,6 @@
 import { GroupNotify, GroupNotifyStatus } from '@/core/entities';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { uid2UinMap } from '@/core/data';
 import { NTQQUserApi } from '@/core/apis/user';
 import { NTQQGroupApi } from '@/core/apis/group';
 
@@ -11,22 +10,22 @@ interface OB11GroupRequestNotify {
   flag: string
 }
 
-export default class GetGroupAddRequest extends BaseAction<null, OB11GroupRequestNotify[]> {
+export default class GetGroupAddRequest extends BaseAction<null, OB11GroupRequestNotify[] | null> {
   actionName = ActionName.GetGroupIgnoreAddRequest;
 
-  protected async _handle(payload: null): Promise<OB11GroupRequestNotify[]> {
+  protected async _handle(payload: null): Promise<OB11GroupRequestNotify[] | null> {
     const data = await NTQQGroupApi.getGroupIgnoreNotifies();
     // log(data);
-    const notifies: GroupNotify[] = data.notifies.filter(notify => notify.status === GroupNotifyStatus.WAIT_HANDLE);
-    const returnData: OB11GroupRequestNotify[] = [];
-    for (const notify of notifies) {
-      const uin = uid2UinMap[notify.user1.uid] || (await NTQQUserApi.getUserDetailInfo(notify.user1.uid))?.uin;
-      returnData.push({
-        group_id: parseInt(notify.group.groupCode),
-        user_id: parseInt(uin),
-        flag: notify.seq
-      });
-    }
-    return returnData;
+    // const notifies: GroupNotify[] = data.notifies.filter(notify => notify.status === GroupNotifyStatus.WAIT_HANDLE);
+    // const returnData: OB11GroupRequestNotify[] = [];
+    // for (const notify of notifies) {
+    //   const uin = || (await NTQQUserApi.getUserDetailInfo(notify.user1.uid))?.uin;
+    //   returnData.push({
+    //     group_id: parseInt(notify.group.groupCode),
+    //     user_id: parseInt(uin),
+    //     flag: notify.seq
+    //   });
+    // }
+    return null;
   }
 }

src/onebot11/action/extends/OCRImage.ts

@@ -1,46 +1,46 @@
-import { DeviceList } from '@/onebot11/main';
-import BaseAction from '../BaseAction';
-import { ActionName } from '../types';
-import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { checkFileReceived, uri2local } from '@/common/utils/file';
-import { NTQQSystemApi } from '@/core';
-import fs from 'fs';
-
-const SchemaData = {
-  type: 'object',
-  properties: {
-    image: { type: 'string' },
-  },
-  required: ['image']
-} as const satisfies JSONSchema;
-
-type Payload = FromSchema<typeof SchemaData>;
-
-export class OCRImage extends BaseAction<Payload, any> {
-  actionName = ActionName.OCRImage;
-  PayloadSchema = SchemaData;
-  protected async _handle(payload: Payload) {
-    const { path, isLocal, errMsg } = (await uri2local(payload.image));
-    if (errMsg) {
-      throw `OCR ${payload.image}失败,image字段可能格式不正确`;
-    }
-    if (path) {
-      await checkFileReceived(path, 5000); // 文件不存在QQ会崩溃，需要提前判断
-      const ret = await NTQQSystemApi.ORCImage(path);
-      if (!isLocal) {
-        fs.unlink(path, () => { });
-      }
-      if (!ret) {
-        throw `OCR ${payload.file}失败`;
-      }
-      return ret.result;
-    }
-    if (!isLocal) {
-      fs.unlink(path, () => { });
-    }
-    throw `OCR ${payload.file}失败,文件可能不存在`;
-  }
-}
-export class IOCRImage extends OCRImage {
-  actionName = ActionName.IOCRImage;
-}
+import { DeviceList } from '@/onebot11/main';
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import { checkFileReceived, uri2local } from '@/common/utils/file';
+import { NTQQSystemApi } from '@/core';
+import fs from 'fs';
+
+const SchemaData = {
+  type: 'object',
+  properties: {
+    image: { type: 'string' },
+  },
+  required: ['image']
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class OCRImage extends BaseAction<Payload, any> {
+  actionName = ActionName.OCRImage;
+  PayloadSchema = SchemaData;
+  protected async _handle(payload: Payload) {
+    const { path, isLocal, errMsg } = (await uri2local(payload.image));
+    if (errMsg) {
+      throw `OCR ${payload.image}失败,image字段可能格式不正确`;
+    }
+    if (path) {
+      await checkFileReceived(path, 5000); // 文件不存在QQ会崩溃，需要提前判断
+      const ret = await NTQQSystemApi.ORCImage(path);
+      if (!isLocal) {
+        fs.unlink(path, () => { });
+      }
+      if (!ret) {
+        throw `OCR ${payload.file}失败`;
+      }
+      return ret.result;
+    }
+    if (!isLocal) {
+      fs.unlink(path, () => { });
+    }
+    throw `OCR ${payload.file}失败,文件可能不存在`;
+  }
+}
+export class IOCRImage extends OCRImage {
+  actionName = ActionName.IOCRImage;
+}

src/onebot11/action/extends/SetSelfProfile.ts

@@ -0,0 +1,32 @@
+
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { NTQQUserApi } from '@/core/apis';
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+
+const SchemaData = {
+    type: 'object',
+    properties: {
+        nick: { type: 'string' },
+        longNick: { type: 'string' },
+        sex: { type: 'number' }//传Sex值？建议传0 
+    },
+    required: ['nick', 'longNick', 'sex',],
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class SetSelfProfile extends BaseAction<Payload, any | null> {
+    actionName = ActionName.SetSelfProfile;
+    PayloadSchema = SchemaData;
+    protected async _handle(payload: Payload) {
+        let ret = await NTQQUserApi.modifySelfProfile({
+            nick: payload.nick,
+            longNick: payload.longNick,
+            sex: payload.sex,
+            birthday: { birthday_year: '', birthday_month: '', birthday_day: '' },
+            location: undefined
+        });
+        return ret;
+    }
+}

src/onebot11/action/file/DelGroupFile.ts

@@ -1,23 +1,23 @@
-import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import BaseAction from '../BaseAction';
-import { ActionName } from '../types';
-import { NTQQGroupApi, NTQQMsgApi, NTQQUserApi } from '@/core/apis';
-
-const SchemaData = {
-    type: 'object',
-    properties: {
-        group_id: { type: ['string', 'number'] },
-        file_id: { type: 'string' },
-    },
-    required: ['group_id', 'file_id']
-} as const satisfies JSONSchema;
-
-type Payload = FromSchema<typeof SchemaData>;
-
-export class DelGroupFile extends BaseAction<Payload, any> {
-    actionName = ActionName.DelGroupFile;
-    PayloadSchema = SchemaData;
-    protected async _handle(payload: Payload) {
-        return await NTQQGroupApi.DelGroupFile(payload.group_id.toString(), [payload.file_id]);
-    }
-}
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { NTQQGroupApi, NTQQMsgApi, NTQQUserApi } from '@/core/apis';
+
+const SchemaData = {
+  type: 'object',
+  properties: {
+    group_id: { type: ['string', 'number'] },
+    file_id: { type: 'string' },
+  },
+  required: ['group_id', 'file_id']
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class DelGroupFile extends BaseAction<Payload, any> {
+  actionName = ActionName.DelGroupFile;
+  PayloadSchema = SchemaData;
+  protected async _handle(payload: Payload) {
+    return await NTQQGroupApi.DelGroupFile(payload.group_id.toString(), [payload.file_id]);
+  }
+}

src/onebot11/action/file/DelGroupFileFolder.ts

@@ -1,23 +1,23 @@
-import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import BaseAction from '../BaseAction';
-import { ActionName } from '../types';
-import { NTQQGroupApi, NTQQMsgApi, NTQQUserApi } from '@/core/apis';
-
-const SchemaData = {
-    type: 'object',
-    properties: {
-        group_id: { type: ['string', 'number'] },
-        folder_id: { type: 'string' },
-    },
-    required: ['group_id', 'folder_id']
-} as const satisfies JSONSchema;
-
-type Payload = FromSchema<typeof SchemaData>;
-
-export class DelGroupFileFolder extends BaseAction<Payload, any> {
-    actionName = ActionName.DelGroupFileFolder;
-    PayloadSchema = SchemaData;
-    protected async _handle(payload: Payload) {
-        return (await NTQQGroupApi.DelGroupFileFolder(payload.group_id.toString(), payload.folder_id)).groupFileCommonResult;
-    }
-}
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { NTQQGroupApi, NTQQMsgApi, NTQQUserApi } from '@/core/apis';
+
+const SchemaData = {
+  type: 'object',
+  properties: {
+    group_id: { type: ['string', 'number'] },
+    folder_id: { type: 'string' },
+  },
+  required: ['group_id', 'folder_id']
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class DelGroupFileFolder extends BaseAction<Payload, any> {
+  actionName = ActionName.DelGroupFileFolder;
+  PayloadSchema = SchemaData;
+  protected async _handle(payload: Payload) {
+    return (await NTQQGroupApi.DelGroupFileFolder(payload.group_id.toString(), payload.folder_id)).groupFileCommonResult;
+  }
+}

src/onebot11/action/file/GetGroupFileCount.ts

@@ -1,23 +1,23 @@
-import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import BaseAction from '../BaseAction';
-import { ActionName } from '../types';
-import { NTQQGroupApi, NTQQUserApi } from '@/core/apis';
-
-const SchemaData = {
-    type: 'object',
-    properties: {
-        group_id: { type: ['string', 'number'] },
-    },
-    required: ['group_id']
-} as const satisfies JSONSchema;
-
-type Payload = FromSchema<typeof SchemaData>;
-
-export class GetGroupFileCount extends BaseAction<Payload, { count: number }> {
-    actionName = ActionName.GetGroupFileCount;
-    PayloadSchema = SchemaData;
-    protected async _handle(payload: Payload) {
-        const ret = await NTQQGroupApi.GetGroupFileCount([payload.group_id?.toString()]);
-        return { count: ret.groupFileCounts[0] };
-    }
-}
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { NTQQGroupApi, NTQQUserApi } from '@/core/apis';
+
+const SchemaData = {
+  type: 'object',
+  properties: {
+    group_id: { type: ['string', 'number'] },
+  },
+  required: ['group_id']
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class GetGroupFileCount extends BaseAction<Payload, { count: number }> {
+  actionName = ActionName.GetGroupFileCount;
+  PayloadSchema = SchemaData;
+  protected async _handle(payload: Payload) {
+    const ret = await NTQQGroupApi.GetGroupFileCount([payload.group_id?.toString()]);
+    return { count: ret.groupFileCounts[0] };
+  }
+}

src/onebot11/action/file/GetGroupFileList.ts

@@ -1,31 +1,31 @@
-import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import BaseAction from '../BaseAction';
-import { ActionName } from '../types';
-import { NTQQGroupApi, NTQQMsgApi, NTQQUserApi } from '@/core/apis';
-
-const SchemaData = {
-    type: 'object',
-    properties: {
-        group_id: { type: ['string', 'number'] },
-        start_index: { type: 'number' },
-        file_count: { type: 'number' },
-    },
-    required: ['group_id', 'start_index', 'file_count']
-} as const satisfies JSONSchema;
-
-type Payload = FromSchema<typeof SchemaData>;
-
-export class GetGroupFileList extends BaseAction<Payload, { FileList: Array<any> }> {
-    actionName = ActionName.GetGroupFileList;
-    PayloadSchema = SchemaData;
-    protected async _handle(payload: Payload) {
-        let ret = await NTQQMsgApi.getGroupFileList(payload.group_id.toString(), {
-            sortType: 1,
-            fileCount: payload.file_count,
-            startIndex: payload.start_index,
-            sortOrder: 2,
-            showOnlinedocFolder: 0
-        }).catch((e) => { return []; });
-        return { FileList: ret };
-    }
-}
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { NTQQGroupApi, NTQQMsgApi, NTQQUserApi } from '@/core/apis';
+
+const SchemaData = {
+  type: 'object',
+  properties: {
+    group_id: { type: ['string', 'number'] },
+    start_index: { type: 'number' },
+    file_count: { type: 'number' },
+  },
+  required: ['group_id', 'start_index', 'file_count']
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class GetGroupFileList extends BaseAction<Payload, { FileList: Array<any> }> {
+  actionName = ActionName.GetGroupFileList;
+  PayloadSchema = SchemaData;
+  protected async _handle(payload: Payload) {
+    const ret = await NTQQMsgApi.getGroupFileList(payload.group_id.toString(), {
+      sortType: 1,
+      fileCount: payload.file_count,
+      startIndex: payload.start_index,
+      sortOrder: 2,
+      showOnlinedocFolder: 0
+    }).catch((e) => { return []; });
+    return { FileList: ret };
+  }
+}

src/onebot11/action/file/SetGroupFileFolder.ts

@@ -1,23 +1,23 @@
-import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import BaseAction from '../BaseAction';
-import { ActionName } from '../types';
-import { NTQQGroupApi, NTQQMsgApi, NTQQUserApi } from '@/core/apis';
-
-const SchemaData = {
-    type: 'object',
-    properties: {
-        group_id: { type: ['string', 'number'] },
-        folder_name: { type: 'string' },
-    },
-    required: ['group_id', 'folder_name']
-} as const satisfies JSONSchema;
-
-type Payload = FromSchema<typeof SchemaData>;
-
-export class SetGroupFileFolder extends BaseAction<Payload, any> {
-    actionName = ActionName.SetGroupFileFolder;
-    PayloadSchema = SchemaData;
-    protected async _handle(payload: Payload) {
-        return (await NTQQGroupApi.CreatGroupFileFolder(payload.group_id.toString(), payload.folder_name)).resultWithGroupItem;
-    }
-}
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { NTQQGroupApi, NTQQMsgApi, NTQQUserApi } from '@/core/apis';
+
+const SchemaData = {
+  type: 'object',
+  properties: {
+    group_id: { type: ['string', 'number'] },
+    folder_name: { type: 'string' },
+  },
+  required: ['group_id', 'folder_name']
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class SetGroupFileFolder extends BaseAction<Payload, any> {
+  actionName = ActionName.SetGroupFileFolder;
+  PayloadSchema = SchemaData;
+  protected async _handle(payload: Payload) {
+    return (await NTQQGroupApi.CreatGroupFileFolder(payload.group_id.toString(), payload.folder_name)).resultWithGroupItem;
+  }
+}

src/onebot11/action/go-cqhttp/GetFriendMsgHistory.ts

@@ -1,6 +1,6 @@
 import BaseAction from '../BaseAction';
 import { OB11Message, OB11User } from '../../types';
-import { getFriend, friends, uid2UinMap, getUidByUin } from '@/core/data';
+import { getFriend, friends } from '@/core/data';
 import { ActionName } from '../types';
 import { ChatType } from '@/core/entities';
 import { dbUtil } from '@/common/utils/db';
@@ -8,6 +8,7 @@ import { NTQQMsgApi } from '@/core/apis/msg';
 import { OB11Constructor } from '../../constructor';
 import { logDebug } from '@/common/utils/log';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import { NTQQUserApi } from '@/core';
 
 interface Response {
   messages: OB11Message[];
@@ -16,7 +17,7 @@ interface Response {
 const SchemaData = {
   type: 'object',
   properties: {
-    user_id: { type: [ 'number' , 'string' ] },
+    user_id: { type: ['number', 'string'] },
     message_seq: { type: 'number' },
     count: { type: 'number' }
   },
@@ -29,7 +30,7 @@ export default class GetFriendMsgHistory extends BaseAction<Payload, Response> {
   actionName = ActionName.GetFriendMsgHistory;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<Response> {
-    const uid = getUidByUin(payload.user_id.toString());
+    const uid = await NTQQUserApi.getUidByUin(payload.user_id.toString());
     if (!uid) {
       throw `记录${payload.user_id}不存在`;
     }

src/onebot11/action/go-cqhttp/GetStrangerInfo.ts

@@ -1,32 +1,43 @@
-import BaseAction from '../BaseAction';
-import { OB11User } from '../../types';
-import { getUidByUin, uid2UinMap } from '@/core/data';
-import { OB11Constructor } from '../../constructor';
-import { ActionName } from '../types';
-import { NTQQUserApi } from '@/core/apis/user';
-import { log, logDebug } from '@/common/utils/log';
-import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-
-const SchemaData = {
-  type: 'object',
-  properties: {
-    user_id: { type: [ 'number' , 'string' ] },
-  },
-  required: ['user_id']
-} as const satisfies JSONSchema;
-
-type Payload = FromSchema<typeof SchemaData>;
-
-export default class GoCQHTTPGetStrangerInfo extends BaseAction<Payload, OB11User> {
-  actionName = ActionName.GoCQHTTP_GetStrangerInfo;
-
-  protected async _handle(payload: Payload): Promise<OB11User> {
-    const user_id = payload.user_id.toString();
-    //logDebug('uidMaps', uidMaps);
-    const uid = getUidByUin(user_id);
-    if (!uid) {
-      throw new Error('查无此人');
-    }
-    return OB11Constructor.stranger(await NTQQUserApi.getUserDetailInfo(uid));
-  }
-}
+import BaseAction from '../BaseAction';
+import { OB11User, OB11UserSex } from '../../types';
+import { OB11Constructor } from '../../constructor';
+import { ActionName } from '../types';
+import { NTQQUserApi } from '@/core/apis/user';
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import { calcQQLevel } from '@/common/utils/qqlevel';
+
+const SchemaData = {
+  type: 'object',
+  properties: {
+    user_id: { type: ['number', 'string'] },
+  },
+  required: ['user_id']
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export default class GoCQHTTPGetStrangerInfo extends BaseAction<Payload, OB11User> {
+  actionName = ActionName.GoCQHTTP_GetStrangerInfo;
+
+  protected async _handle(payload: Payload): Promise<OB11User> {
+    const user_id = payload.user_id.toString();
+    let extendData = await NTQQUserApi.getUserDetailInfoByUin(user_id);
+    let uid = (await NTQQUserApi.getUidByUin(user_id))!;
+    if (!uid || uid.indexOf('*') != -1) {
+      let ret = {
+        ...extendData,
+        user_id: parseInt(extendData.info.uin) || 0,
+        nickname: extendData.info.nick,
+        sex: OB11UserSex.unknown,
+        age: (extendData.info.birthday_year == 0) ? 0 : new Date().getFullYear() - extendData.info.birthday_year,
+        qid: extendData.info.qid,
+        level: extendData.info.qqLevel && calcQQLevel(extendData.info.qqLevel) || 0,
+        login_days: 0,
+        uid: ''
+      }
+      return ret;
+    }
+    let data = { ...extendData, ...(await NTQQUserApi.getUserDetailInfo(uid)) };
+    return OB11Constructor.stranger(data);
+  }
+}

src/onebot11/action/go-cqhttp/UploadGroupFile.ts

@@ -10,12 +10,13 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 const SchemaData = {
   type: 'object',
   properties: {
-    group_id: { type: [ 'number' , 'string' ] },
+    group_id: { type: ['number', 'string'] },
     file: { type: 'string' },
     name: { type: 'string' },
-    folder: { type: 'string' }
+    folder: { type: 'string' },
+    folder_id: { type: 'string' }//临时扩展
   },
-  required: ['group_id', 'file', 'name', 'folder']
+  required: ['group_id', 'file', 'name']
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
@@ -36,7 +37,7 @@ export default class GoCQHTTPUploadGroupFile extends BaseAction<Payload, null> {
     if (downloadResult.errMsg) {
       throw new Error(downloadResult.errMsg);
     }
-    const sendFileEle: SendFileElement = await SendMsgElementConstructor.file(downloadResult.path, payload.name);
+    const sendFileEle: SendFileElement = await SendMsgElementConstructor.file(downloadResult.path, payload.name, payload.folder_id);
     await sendMsg({ chatType: ChatType.group, peerUid: group.groupCode }, [sendFileEle], [], true);
     return null;
   }

src/onebot11/action/group/GetGroupMemberInfo.ts

@@ -1,66 +1,65 @@
-import { OB11GroupMember } from '../../types';
-import { getGroup, getGroupMember, groupMembers } from '@/core/data';
-import { OB11Constructor } from '../../constructor';
-import BaseAction from '../BaseAction';
-import { ActionName } from '../types';
-import { NTQQUserApi } from '@/core/apis/user';
-import { log, logDebug } from '@/common/utils/log';
-import { isNull } from '../../../common/utils/helper';
-import { WebApi } from '@/core/apis/webapi';
-import { NTQQGroupApi } from '@/core';
-import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-
-// no_cache get时传字符串
-const SchemaData = {
-  type: 'object',
-  properties: {
-    group_id: { type: ['number', 'string'] },
-    user_id: { type: ['number', 'string'] },
-    no_cache: { type: ['boolean', 'string'] },
-  },
-  required: ['group_id', 'user_id']
-} as const satisfies JSONSchema;
-
-type Payload = FromSchema<typeof SchemaData>;
-
-class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
-  actionName = ActionName.GetGroupMemberInfo;
-  PayloadSchema = SchemaData;
-  protected async _handle(payload: Payload) {
-    const group = await getGroup(payload.group_id.toString());
-    if (!group) {
-      throw (`群(${payload.group_id})不存在`);
-    }
-    const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString());
-    if (payload.no_cache == true || payload.no_cache === 'true') {
-      groupMembers.set(group.groupCode, await NTQQGroupApi.getGroupMembers(payload.group_id.toString()));
-    }
-    const member = await getGroupMember(payload.group_id.toString(), payload.user_id.toString());
-    // log(member);
-    if (member) {
-      logDebug('获取群成员详细信息');
-      try {
-        const info = (await NTQQUserApi.getUserDetailInfo(member.uid));
-        logDebug('群成员详细信息结果', info);
-        Object.assign(member, info);
-      } catch (e) {
-        logDebug('获取群成员详细信息失败, 只能返回基础信息', e);
-      }
-      const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member);
-      for (let i = 0, len = webGroupMembers.length; i < len; i++) {
-        if (webGroupMembers[i]?.uin && webGroupMembers[i].uin === retMember.user_id) {
-          retMember.join_time = webGroupMembers[i]?.join_time;
-          retMember.last_sent_time = webGroupMembers[i]?.last_speak_time;
-          retMember.qage = webGroupMembers[i]?.qage;
-          retMember.level = webGroupMembers[i]?.lv.level;
-        }
-
-      }
-      return retMember;
-    } else {
-      throw (`群(${payload.group_id})成员${payload.user_id}不存在`);
-    }
-  }
-}
-
-export default GetGroupMemberInfo;
+import { OB11GroupMember } from '../../types';
+import { getGroup, getGroupMember, groupMembers } from '@/core/data';
+import { OB11Constructor } from '../../constructor';
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { NTQQUserApi } from '@/core/apis/user';
+import { log, logDebug } from '@/common/utils/log';
+import { isNull } from '../../../common/utils/helper';
+import { WebApi } from '@/core/apis/webapi';
+import { NTQQGroupApi } from '@/core';
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+
+// no_cache get时传字符串
+const SchemaData = {
+  type: 'object',
+  properties: {
+    group_id: { type: ['number', 'string'] },
+    user_id: { type: ['number', 'string'] },
+    no_cache: { type: ['boolean', 'string'] },
+  },
+  required: ['group_id', 'user_id']
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
+  actionName = ActionName.GetGroupMemberInfo;
+  PayloadSchema = SchemaData;
+  protected async _handle(payload: Payload) {
+    const group = await getGroup(payload.group_id.toString());
+    if (!group) {
+      throw (`群(${payload.group_id})不存在`);
+    }
+    const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString());
+    if (payload.no_cache == true || payload.no_cache === 'true') {
+      groupMembers.set(group.groupCode, await NTQQGroupApi.getGroupMembers(payload.group_id.toString()));
+    }
+    const member = await getGroupMember(payload.group_id.toString(), payload.user_id.toString());
+    // log(member);
+    if (member) {
+      logDebug('获取群成员详细信息');
+      try {
+        const info = (await NTQQUserApi.getUserDetailInfo(member.uid));
+        logDebug('群成员详细信息结果', info);
+        Object.assign(member, info);
+      } catch (e) {
+        logDebug('获取群成员详细信息失败, 只能返回基础信息', e);
+      }
+      const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member);
+      for (let i = 0, len = webGroupMembers.length; i < len; i++) {
+        if (webGroupMembers[i]?.uin && webGroupMembers[i].uin === retMember.user_id) {
+          retMember.join_time = webGroupMembers[i]?.join_time;
+          retMember.last_sent_time = webGroupMembers[i]?.last_speak_time;
+          retMember.qage = webGroupMembers[i]?.qage;
+          retMember.level = webGroupMembers[i]?.lv.level.toString();
+        }
+      }
+      return retMember;
+    } else {
+      throw (`群(${payload.group_id})成员${payload.user_id}不存在`);
+    }
+  }
+}
+
+export default GetGroupMemberInfo;

src/onebot11/action/group/GetGroupMemberList.ts

@@ -9,11 +9,12 @@ import { logDebug } from '@/common/utils/log';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { ob11Config } from '@/onebot11/config';
 import { dbUtil } from '@/common/utils/db';
+import { TypeConvert } from '@/common/utils/type';
 
 const SchemaData = {
   type: 'object',
   properties: {
-    group_id: { type: [ 'number' , 'string' ] },
+    group_id: { type: ['number', 'string'] },
     no_cache: { type: ['boolean', 'string'] },
   },
   required: ['group_id']
@@ -58,14 +59,14 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
           MemberData.join_time = webGroupMembers[i]?.join_time;
           MemberData.last_sent_time = webGroupMembers[i]?.last_speak_time;
           MemberData.qage = webGroupMembers[i]?.qage;
-          MemberData.level = webGroupMembers[i]?.lv.level;
+          MemberData.level = webGroupMembers[i]?.lv.level.toString();
           MemberMap.set(webGroupMembers[i]?.uin, MemberData);
         }
       }
     } else if (ob11Config.GroupLocalTime.Record && ob11Config.GroupLocalTime.RecordList[0] === '-1' || ob11Config.GroupLocalTime.RecordList.includes(payload.group_id.toString())) {
-      const _sendAndJoinRember = await dbUtil.getLastSentTimeAndJoinTime(payload.group_id);
+      const _sendAndJoinRember = await dbUtil.getLastSentTimeAndJoinTime(TypeConvert.toNumber(payload.group_id));
       _sendAndJoinRember.forEach((element) => {
-        let MemberData = MemberMap.get(element.user_id);
+        const MemberData = MemberMap.get(element.user_id);
         if (MemberData) {
           MemberData.join_time = element.join_time;
           MemberData.last_sent_time = element.last_sent_time;
@@ -73,6 +74,15 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
       });
     }
     // 还原索引到Array 一同返回
+
+    // let retData: any[] = [];
+    // for (let retMem of MemberMap.values()) {
+    //   retMem.level = TypeConvert.toString(retMem.level) as any;
+    //   retData.push(retMem)
+    // }
+
+    // _groupMembers = Array.from(retData);
+    
     _groupMembers = Array.from(MemberMap.values());
     return _groupMembers;
   }

src/onebot11/action/group/GetGroupSystemMsg.ts

@@ -1,14 +1,12 @@
-import { NTQQGroupApi } from '@/core';
+import { NTQQGroupApi, NTQQUserApi } from '@/core';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQMsgApi } from '@/core/apis/msg';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { uid2UinMap } from '@/core/data';
 
 const SchemaData = {
   type: 'object',
   properties: {
-    group_id: { type: [ 'number' , 'string' ] }
+    group_id: { type: ['number', 'string'] }
   },
 } as const satisfies JSONSchema;
 
@@ -24,22 +22,22 @@ export class GetGroupSystemMsg extends BaseAction<void, any> {
       if (SSNotify.type == 1) {
         retData.InvitedRequest.push({
           request_id: SSNotify.seq,
-          invitor_uin: uid2UinMap[SSNotify.user1?.uid],
+          invitor_uin: await NTQQUserApi.getUinByUid(SSNotify.user1?.uid),
           invitor_nick: SSNotify.user1?.nickName,
           group_id: SSNotify.group?.groupCode,
           group_name: SSNotify.group?.groupName,
           checked: SSNotify.status === 1 ? false : true,
-          actor: uid2UinMap[SSNotify.user2?.uid] || 0,
+          actor: await NTQQUserApi.getUinByUid(SSNotify.user2?.uid) || 0,
         });
       } else if (SSNotify.type == 7) {
         retData.join_requests.push({
           request_id: SSNotify.seq,
-          requester_uin: uid2UinMap[SSNotify.user1?.uid],
+          requester_uin: await NTQQUserApi.getUinByUid(SSNotify.user1?.uid),
           requester_nick: SSNotify.user1?.nickName,
           group_id: SSNotify.group?.groupCode,
           group_name: SSNotify.group?.groupName,
           checked: SSNotify.status === 1 ? false : true,
-          actor: uid2UinMap[SSNotify.user2?.uid] || 0,
+          actor: await NTQQUserApi.getUinByUid(SSNotify.user2?.uid) || 0,
         });
       }
     }

src/onebot11/action/group/SetGroupAddRequest.ts

@@ -9,10 +9,10 @@ const SchemaData = {
   type: 'object',
   properties: {
     flag: { type: 'string' },
-    approve: { type: 'boolean' },
+    approve: { type: ['string', 'boolean'] },
     reason: { type: 'string' }
   },
-  required: ['flag', 'approve', 'reason']
+  required: ['flag'],
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
@@ -22,7 +22,7 @@ export default class SetGroupAddRequest extends BaseAction<Payload, null> {
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<null> {
     const flag = payload.flag.toString();
-    const approve = payload.approve.toString() === 'true';
+    const approve = payload.approve?.toString() !== 'false';
     const notify = groupNotifies[flag];
     if (!notify) {
       throw `${flag}对应的加群通知不存在`;

src/onebot11/action/group/SetGroupAdmin.ts

@@ -12,7 +12,7 @@ const SchemaData = {
     user_id: { type: [ 'number' , 'string' ] },
     enable: { type: 'boolean' }
   },
-  required: ['group_id', 'user_id', 'enable']
+  required: ['group_id', 'user_id']
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
@@ -23,7 +23,7 @@ export default class SetGroupAdmin extends BaseAction<Payload, null> {
   protected async _handle(payload: Payload): Promise<null> {
     const member = await getGroupMember(payload.group_id, payload.user_id);
     // 已经前置验证类型
-    const enable = payload.enable.toString() === 'true';
+    const enable = payload.enable?.toString() !== 'false';
     if (!member) {
       throw `群成员${payload.user_id}不存在`;
     }

src/onebot11/action/group/SetGroupKick.ts

@@ -10,9 +10,9 @@ const SchemaData = {
   properties: {
     group_id: { type: [ 'number' , 'string' ] },
     user_id: { type: [ 'number' , 'string' ] },
-    reject_add_request: { type: 'boolean' }
+    reject_add_request: { type: [ 'boolean' , 'string' ] }
   },
-  required: ['group_id', 'user_id', 'reject_add_request']
+  required: ['group_id', 'user_id']
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
@@ -25,7 +25,8 @@ export default class SetGroupKick extends BaseAction<Payload, null> {
     if (!member) {
       throw `群成员${payload.user_id}不存在`;
     }
-    await NTQQGroupApi.kickMember(payload.group_id.toString(), [member.uid], !!payload.reject_add_request);
+    let rejectReq = payload.reject_add_request?.toString() == 'true';
+    await NTQQGroupApi.kickMember(payload.group_id.toString(), [member.uid], rejectReq);
     return null;
   }
 }