From b7ddefc95084d039bdb219a5344b8b42162e8de7 Mon Sep 17 00:00:00 2001
From: linyuchen <lin.yu.chen@hotmail.com>
Date: Wed, 29 May 2024 16:38:22 +0800
Subject: [PATCH] fix: QZone cookies
---
manifest.json | 4 ++--
src/common/utils/request.ts | 5 ++++-
src/ntqqapi/api/user.ts | 3 ++-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/manifest.json b/manifest.json
index 0d2fa92..25b33e1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,10 +1,10 @@
{
"manifest_version": 4,
"type": "extension",
- "name": "LLOneBot v3.26.3",
+ "name": "LLOneBot v3.26.4",
"slug": "LLOneBot",
"description": "使你的NTQQ支持OneBot11协议进行QQ机器人开发, 不支持商店在线更新",
- "version": "3.26.3",
+ "version": "3.26.4",
"icon": "./icon.jpg",
"authors": [
{
diff --git a/src/common/utils/request.ts b/src/common/utils/request.ts
index c5b303d..0487ecc 100644
--- a/src/common/utils/request.ts
+++ b/src/common/utils/request.ts
@@ -1,5 +1,6 @@
import https from 'node:https';
import http from 'node:http';
+import { log } from '@/common/utils/log'
export class RequestUtil {
// 适用于获取服务器下发cookies时获取，仅GET
@@ -15,6 +16,7 @@ export class RequestUtil {
const redirectUrl = new URL(res.headers.location, url);
RequestUtil.HttpsGetCookies(redirectUrl.href).then((redirectCookies) => {
// 合并重定向过程中的cookies
+ log('redirectCookies', redirectCookies)
cookies = { ...cookies, ...redirectCookies };
resolve(cookies);
});
@@ -30,7 +32,8 @@ export class RequestUtil {
handleRedirect(res);
});
if (res.headers['set-cookie']) {
- //console.log(res.headers['set-cookie']);
+ // console.log(res.headers['set-cookie']);
+ log('set-cookie', url, res.headers['set-cookie']);
res.headers['set-cookie'].forEach((cookie) => {
const parts = cookie.split(';')[0].split('=');
const key = parts[0];
diff --git a/src/ntqqapi/api/user.ts b/src/ntqqapi/api/user.ts
index a6f058b..90dc84a 100644
--- a/src/ntqqapi/api/user.ts
+++ b/src/ntqqapi/api/user.ts
@@ -100,11 +100,12 @@ 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'
+ const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + selfInfo.uin + '&clientkey=' + (await this.getClientKey()).clientKey + '&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) {
+ log('获取QZone Cookies失败', e)
cookies = {}
}
return cookies;