Merge pull request #242 from LLOneBot/dev

feat: support qzone cookies

src/common/utils/request.ts

@@ -3,28 +3,45 @@ import http from 'node:http';
 
 export class RequestUtil {
   // 适用于获取服务器下发cookies时获取，仅GET
-  static async HttpsGetCookies(url: string): Promise<Map<string, string>> {
+  static async HttpsGetCookies(url: string): Promise<{ [key: string]: string }> {
-    return new Promise<Map<string, string>>((resolve, reject) => {
+    const client = url.startsWith('https') ? https : http;
-      const protocol = url.startsWith('https://') ? https : http;
+    return new Promise((resolve, reject) => {
-      protocol.get(url, (res) => {
+      client.get(url, (res) => {
-        const cookiesHeader = res.headers['set-cookie'];
+        let cookies: { [key: string]: string } = {};
-        if (!cookiesHeader) {
+        const handleRedirect = (res: http.IncomingMessage) => {
-          resolve(new Map<string, string>());
+          //console.log(res.headers.location);
-        } else {
+          if (res.statusCode === 301 || res.statusCode === 302) {
-          const cookiesMap = new Map<string, string>();
+            if (res.headers.location) {
-          cookiesHeader.forEach((cookieStr) => {
+              const redirectUrl = new URL(res.headers.location, url);
-            cookieStr.split(';').forEach((cookiePart) => {
+              RequestUtil.HttpsGetCookies(redirectUrl.href).then((redirectCookies) => {
-              const trimmedPart = cookiePart.trim();
+                // 合并重定向过程中的cookies
-              if (trimmedPart.includes('=')) {
+                cookies = { ...cookies, ...redirectCookies };
-                const [key, value] = trimmedPart.split('=').map(part => part.trim());
+                resolve(cookies);
-                cookiesMap.set(key, decodeURIComponent(value)); // 解码cookie值
+              });
-              }
+            } else {
-            });
+              resolve(cookies);
+            }
+          } else {
+            resolve(cookies);
+          }
+        };
+        res.on('data', () => { }); // Necessary to consume the stream
+        res.on('end', () => {
+          handleRedirect(res);
+        });
+        if (res.headers['set-cookie']) {
+          //console.log(res.headers['set-cookie']);
+          res.headers['set-cookie'].forEach((cookie) => {
+            const parts = cookie.split(';')[0].split('=');
+            const key = parts[0];
+            const value = parts[1];
+            if (key && value && key.length > 0 && value.length > 0) {
+              cookies[key] = value;
+            }
           });
-          resolve(cookiesMap);
         }
-      }).on('error', (error) => {
+      }).on('error', (err) => {
-        reject(error);
+        reject(err);
       });
     });
   }

src/ntqqapi/api/user.ts

@@ -6,6 +6,7 @@ import { NTQQWindowApi, NTQQWindows } from './window'
 import { cacheFunc, isQQ998, log, sleep } from '../../common/utils'
 import { wrapperApi } from '@/ntqqapi/native/wrapper'
 import * as https from 'https'
+import { RequestUtil } from '@/common/utils/request'
 
 let userInfoCache: Record<string, User> = {} // uid: User
 
@@ -98,7 +99,16 @@ export class NTQQUserApi {
       ],
     })
   }
-
+  static async getQzoneCookies() {
+    const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + selfInfo.uin + '&clientkey=' + this.getClientKey() + '&u1=https%3A%2F%2Fuser.qzone.qq.com%2F' + selfInfo.uin + '%2Finfocenter&keyindex=19%27'
+    let cookies: { [key: string]: string; } = {};
+    try {
+      cookies = await RequestUtil.HttpsGetCookies(requestUrl);
+    } catch (e: any) {
+      cookies = {}
+    }
+    return cookies;
+  }
   static async getSkey(): Promise<string> {
     const clientKeyData = await this.getClientKey()
     if (clientKeyData.result !== 0) {
@@ -106,33 +116,19 @@ export class NTQQUserApi {
     }
     const url = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + selfInfo.uin
       + '&clientkey=' + clientKeyData.clientKey
-      + '&u1=https%3A%2F%2Fh5.qzone.qq.com%2Fqqnt%2Fqzoneinpcqq%2Ffriend%3Frefresh%3D0%26clientuin%3D0%26darkMode%3D0&keyindex=' + clientKeyData.keyIndex
+      + '&u1=https%3A%2F%2Fh5.qzone.qq.com%2Fqqnt%2Fqzoneinpcqq%2Ffriend%3Frefresh%3D0%26clientuin%3D0%26darkMode%3D0&keyindex=' + clientKeyData.keyIndex;
-
+    return (await RequestUtil.HttpsGetCookies(url))?.skey;
-    return new Promise((resolve, reject) => {
-      const req = https.get(url, (res) => {
-        const rawCookies = res.headers['set-cookie']
-        const cookies = {}
-        rawCookies.forEach(cookie => {
-          // 使用正则表达式匹配 cookie 名称和值
-          const regex = /([^=;]+)=([^;]*)/
-          const match = regex.exec(cookie)
-          if (match) {
-            cookies[match[1].trim()] = match[2].trim()
-          }
-        })
-        resolve(cookies['skey'])
-      })
-      req.on('error', e => {
-        reject(e)
-      });
-      req.end();
-    });
   }
 
   @cacheFunc(60 * 30 * 1000)
   static async getCookies(domain: string) {
+    if (domain.endsWith("qzone.qq.com")) {
+      let data = (await NTQQUserApi.getQzoneCookies());
+      const CookieValue = 'p_skey=' + data.p_skey + '; skey=' + data.skey + '; p_uin=o' + selfInfo.uin + '; uin=o' + selfInfo.uin;
+      return { bkn: NTQQUserApi.genBkn(data.p_skey), cookies: CookieValue };
+    }
     const skey = await this.getSkey();
-    const pskey= (await this.getPSkey([domain])).get(domain);
+    const pskey = (await this.getPSkey([domain])).get(domain);
     if (!pskey || !skey) {
       throw new Error('获取Cookies失败')
     }

src/onebot11/action/user/GetCookie.ts

@@ -1,17 +1,17 @@
-import BaseAction from '../BaseAction'
+import BaseAction from '../BaseAction'
-import { NTQQUserApi } from '../../../ntqqapi/api'
+import { NTQQUserApi, WebApi } from '../../../ntqqapi/api'
-import { groups } from '../../../common/data'
+import { groups, selfInfo } from '../../../common/data'
-import { ActionName } from '../types'
+import { ActionName } from '../types'
-
+
-interface Payload {
+interface Payload {
-  domain: string
+  domain: string
-}
+}
-
+
-export class GetCookies extends BaseAction<Payload, { cookies: string; bkn: string }> {
+export class GetCookies extends BaseAction<Payload, { cookies: string; bkn: string }> {
-  actionName = ActionName.GetCookies
+  actionName = ActionName.GetCookies
-
+
-  protected async _handle(payload: Payload) {
+  protected async _handle(payload: Payload) {
-    const domain = payload.domain || 'qun.qq.com'
+    const domain = payload.domain || 'qun.qq.com'
-    return NTQQUserApi.getCookies(domain);
+    return NTQQUserApi.getCookies(domain);
-  }
+  }
-}
+}