update: cookie 处理优化
This commit is contained in:
@@ -14,6 +14,14 @@ module.exports = {
|
||||
})
|
||||
return obj
|
||||
},
|
||||
cookieObjToString(cookie) {
|
||||
return Object.keys(cookie)
|
||||
.map(
|
||||
(key) =>
|
||||
`${encodeURIComponent(key)}=${encodeURIComponent(cookie[key])}`,
|
||||
)
|
||||
.join('; ')
|
||||
},
|
||||
getRandom(num) {
|
||||
var random = Math.floor(
|
||||
(Math.random() + Math.floor(Math.random() * 9 + 1)) *
|
||||
|
||||
@@ -8,18 +8,20 @@ const tunnel = require('tunnel')
|
||||
const fs = require('fs')
|
||||
const path = require('path')
|
||||
const tmpPath = require('os').tmpdir()
|
||||
const { cookieToJson, cookieObjToString } = require('./index')
|
||||
const anonymous_token = fs.readFileSync(
|
||||
path.resolve(tmpPath, './anonymous_token'),
|
||||
'utf-8',
|
||||
)
|
||||
const { URLSearchParams, URL } = require('url')
|
||||
const iosAppVersion = '9.0.65'
|
||||
// request.debug = true // 开启可看到更详细信息
|
||||
|
||||
const chooseUserAgent = (uaType) => {
|
||||
const userAgentMap = {
|
||||
mobile:
|
||||
'Mozilla/5.0 (iPhone; CPU iPhone OS 17_2_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2 Mobile/15E148 Safari/604.1',
|
||||
pc: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 Edg/120.0.0.0',
|
||||
'Mozilla/5.0 (iPhone; CPU iPhone OS 17_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4.1 Mobile/15E148 Safari/604.1',
|
||||
pc: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36 Edg/124.0.0.0',
|
||||
}
|
||||
if (uaType === 'mobile') {
|
||||
return userAgentMap.mobile
|
||||
@@ -27,9 +29,12 @@ const chooseUserAgent = (uaType) => {
|
||||
return userAgentMap.pc
|
||||
}
|
||||
const createRequest = (method, url, data = {}, options) => {
|
||||
const cookie = options.cookie || {}
|
||||
return new Promise((resolve, reject) => {
|
||||
let headers = {
|
||||
'User-Agent': options.ua || chooseUserAgent(options.uaType),
|
||||
os: cookie.os || 'ios',
|
||||
appver: cookie.appver || (cookie.os != 'pc' ? iosAppVersion : ''),
|
||||
}
|
||||
options.headers = options.headers || {}
|
||||
headers = {
|
||||
@@ -53,6 +58,9 @@ const createRequest = (method, url, data = {}, options) => {
|
||||
__remember_me: true,
|
||||
// NMTID: CryptoJS.lib.WordArray.random(16).toString(),
|
||||
_ntes_nuid: CryptoJS.lib.WordArray.random(16).toString(),
|
||||
os: options.cookie.os || 'ios',
|
||||
appver:
|
||||
options.cookie.appver || (cookie.os != 'pc' ? iosAppVersion : ''),
|
||||
}
|
||||
if (url.indexOf('login') === -1) {
|
||||
options.cookie['NMTID'] = CryptoJS.lib.WordArray.random(16).toString()
|
||||
@@ -61,22 +69,20 @@ const createRequest = (method, url, data = {}, options) => {
|
||||
// 游客
|
||||
if (!options.cookie.MUSIC_A) {
|
||||
options.cookie.MUSIC_A = anonymous_token
|
||||
options.cookie.os = options.cookie.os || 'ios'
|
||||
options.cookie.appver = options.cookie.appver || '9.0.65'
|
||||
}
|
||||
}
|
||||
headers['Cookie'] = Object.keys(options.cookie)
|
||||
.map(
|
||||
(key) =>
|
||||
encodeURIComponent(key) +
|
||||
'=' +
|
||||
encodeURIComponent(options.cookie[key]),
|
||||
)
|
||||
.join('; ')
|
||||
headers['Cookie'] = cookieObjToString(options.cookie)
|
||||
} else if (options.cookie) {
|
||||
headers['Cookie'] = options.cookie
|
||||
// cookie string
|
||||
const cookie = cookieToJson(options.cookie)
|
||||
cookie.os = cookie.os || 'ios'
|
||||
cookie.appver = cookie.appver || (cookie.os != 'pc' ? iosAppVersion : '')
|
||||
headers['Cookie'] = cookieObjToString(cookie)
|
||||
} else {
|
||||
headers['Cookie'] = '__remember_me=true; NMTID=xxx'
|
||||
const cookie = cookieToJson('__remember_me=true; NMTID=xxx')
|
||||
cookie.os = cookie.os || 'ios'
|
||||
cookie.appver = cookie.appver || (cookie.os != 'pc' ? iosAppVersion : '')
|
||||
headers['Cookie'] = cookieObjToString(cookie)
|
||||
}
|
||||
// console.log(options.cookie, headers['Cookie'])
|
||||
if (options.crypto === 'weapi') {
|
||||
@@ -98,9 +104,9 @@ const createRequest = (method, url, data = {}, options) => {
|
||||
const cookie = options.cookie || {}
|
||||
const csrfToken = cookie['__csrf'] || ''
|
||||
const header = {
|
||||
osver: cookie.osver || '17.1.2', //系统版本
|
||||
deviceId: cookie.deviceId, //encrypt.base64.encode(imei + '\t02:00:00:00:00:00\t5106025eb79a5247\t70ffbaac7')
|
||||
appver: cookie.appver || '9.0.65', // app版本
|
||||
osver: cookie.osver || '17.4.1', //系统版本
|
||||
deviceId: cookie.deviceId || '', //encrypt.base64.encode(imei + '\t02:00:00:00:00:00\t5106025eb79a5247\t70ffbaac7')
|
||||
appver: cookie.appver || iosAppVersion, // app版本
|
||||
versioncode: cookie.versioncode || '140', //版本号
|
||||
mobilename: cookie.mobilename || '', //设备model
|
||||
buildver: cookie.buildver || Date.now().toString().substr(0, 10),
|
||||
@@ -125,6 +131,7 @@ const createRequest = (method, url, data = {}, options) => {
|
||||
url = url.replace(/\w*api/, 'eapi')
|
||||
}
|
||||
const answer = { status: 500, body: {}, cookie: [] }
|
||||
// console.log(headers, 'headers')
|
||||
let settings = {
|
||||
method: method,
|
||||
url: url,
|
||||
|
||||
Reference in New Issue
Block a user