Merge branch 'main' into 'main'
Some checks failed
Node.js CI / Test (14.x) (push) Failing after 5m10s
Node.js CI / Test (16.x) (push) Failing after 5m7s
Node.js CI / Test (18.x) (push) Failing after 5m11s
Node.js CI / Lint (14.x) (push) Failing after 5m9s

fix: weapi的cookie不需要os和appver,避免听歌打卡接口不被记录

See merge request Binaryify/neteasecloudmusicapi!18
This commit is contained in:
binaryify 2024-07-30 01:35:34 +00:00
commit 377970c73d

View File

@ -57,9 +57,6 @@ const createRequest = (method, uri, data = {}, options) => {
__remember_me: true, __remember_me: true,
// NMTID: CryptoJS.lib.WordArray.random(16).toString(), // NMTID: CryptoJS.lib.WordArray.random(16).toString(),
_ntes_nuid: 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 (uri.indexOf('login') === -1) { if (uri.indexOf('login') === -1) {
options.cookie['NMTID'] = CryptoJS.lib.WordArray.random(16).toString() options.cookie['NMTID'] = CryptoJS.lib.WordArray.random(16).toString()
@ -73,14 +70,9 @@ const createRequest = (method, uri, data = {}, options) => {
headers['Cookie'] = cookieObjToString(options.cookie) headers['Cookie'] = cookieObjToString(options.cookie)
} else if (options.cookie) { } else if (options.cookie) {
// cookie string // cookie string
const cookie = cookieToJson(options.cookie) headers['Cookie'] = options.cookie
cookie.os = cookie.os || 'ios'
cookie.appver = cookie.appver || (cookie.os != 'pc' ? iosAppVersion : '')
headers['Cookie'] = cookieObjToString(cookie)
} else { } else {
const cookie = cookieToJson('__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) headers['Cookie'] = cookieObjToString(cookie)
} }
// console.log(options.cookie, headers['Cookie']) // console.log(options.cookie, headers['Cookie'])
@ -127,13 +119,13 @@ const createRequest = (method, uri, data = {}, options) => {
const header = { const header = {
osver: cookie.osver || '17.4.1', //系统版本 osver: cookie.osver || '17.4.1', //系统版本
deviceId: cookie.deviceId || global.deviceId, deviceId: cookie.deviceId || global.deviceId,
appver: cookie.appver || iosAppVersion, // app版本 os: cookie.os || 'ios',
appver: cookie.appver || (cookie.os != 'pc' ? iosAppVersion : ''), // app版本
versioncode: cookie.versioncode || '140', //版本号 versioncode: cookie.versioncode || '140', //版本号
mobilename: cookie.mobilename || '', //设备model mobilename: cookie.mobilename || '', //设备model
buildver: cookie.buildver || Date.now().toString().substr(0, 10), buildver: cookie.buildver || Date.now().toString().substr(0, 10),
resolution: cookie.resolution || '1920x1080', //设备分辨率 resolution: cookie.resolution || '1920x1080', //设备分辨率
__csrf: csrfToken, __csrf: csrfToken,
os: cookie.os || 'ios',
channel: cookie.channel || '', channel: cookie.channel || '',
requestId: `${Date.now()}_${Math.floor(Math.random() * 1000) requestId: `${Date.now()}_${Math.floor(Math.random() * 1000)
.toString() .toString()