Compare commits

..
Author SHA1 Message Date
dependabot[bot] 9c12d01719 build(packages): bump mocha from 11.8.0 to 12.0.3
Bumps [mocha](https://github.com/mochajs/mocha) from 11.8.0 to 12.0.3.
- [Release notes](https://github.com/mochajs/mocha/releases)
- [Changelog](https://github.com/mochajs/mocha/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mochajs/mocha/compare/v11.8.0...v12.0.3)

---
updated-dependencies:
- dependency-name: mocha
  dependency-version: 12.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-10-06 12:44:33 +00:00
12 changed files with 239 additions and 433 deletions
-1
View File
@@ -1,6 +1,5 @@
export interface RequestBaseConfig { export interface RequestBaseConfig {
cookie?: string cookie?: string
headers?: Record<string, string | string[]>
realIP?: string // IPv4/IPv6 filled in X-Real-IP realIP?: string // IPv4/IPv6 filled in X-Real-IP
proxy?: string // HTTP proxy proxy?: string // HTTP proxy
randomCNIP?: boolean // Whether to use a random Chinese IP address filled in X-Real-IP randomCNIP?: boolean // Whether to use a random Chinese IP address filled in X-Real-IP
+3 -1
View File
@@ -25,7 +25,9 @@ moduleFiles.forEach((file) => {
obj[fn] = function (data = {}) { obj[fn] = function (data = {}) {
const cookie = const cookie =
typeof data.cookie === 'string' ? cookieToJson(data.cookie) : data.cookie typeof data.cookie === 'string'
? cookieToJson(data.cookie)
: data.cookie || {}
return fileModule( return fileModule(
{ {
+2 -7
View File
@@ -1,15 +1,10 @@
const QRCode = require('qrcode') const QRCode = require('qrcode')
const { generateChainId, getCookieHeader, hasCookie } = require('../util/index') const { generateChainId } = require('../util/index')
module.exports = (query) => { module.exports = (query) => {
return new Promise(async (resolve) => { return new Promise(async (resolve) => {
const platform = query.platform || 'pc' const platform = query.platform || 'pc'
const headerCookie = getCookieHeader(query.headers) const cookie = query.cookie || ''
const cookie = hasCookie(query.cookie)
? query.cookie
: hasCookie(headerCookie)
? headerCookie
: ''
// 构建基础URL // 构建基础URL
let url = `https://music.163.com/login?codekey=${query.key}` let url = `https://music.163.com/login?codekey=${query.key}`
+2 -10
View File
@@ -1,26 +1,18 @@
// 听歌打卡 // 听歌打卡
const createOption = require('../util/option.js') const createOption = require('../util/option.js')
const { getCookieHeader, hasCookie } = require('../util/index')
const { APP_CONF } = require('../util/config.json') const { APP_CONF } = require('../util/config.json')
const DOMAIN = APP_CONF.clDomian const DOMAIN = APP_CONF.clDomian
module.exports = async (query, request) => { module.exports = async (query, request) => {
// 注入 os=osx 的 cookie // 注入 os=osx 的 cookie
const headerCookie = getCookieHeader(query.headers) let cookie = query.cookie || ''
let cookie = hasCookie(query.cookie)
? query.cookie
: hasCookie(headerCookie)
? headerCookie
: process.env.NETEASE_COOKIE || ''
if (typeof cookie === 'object') { if (typeof cookie === 'object') {
cookie = Object.assign({ os: 'osx' }, cookie) cookie = Object.assign({ os: 'osx' }, cookie)
} else if (typeof cookie === 'string') { } else if (typeof cookie === 'string') {
if (cookie.indexOf('os=') > -1) { if (cookie.indexOf('os=') > -1) {
cookie = cookie.replace(/os=[^;]+/g, 'os=osx') cookie = cookie.replace(/os=[^;]+/g, 'os=osx')
} else if (cookie) {
cookie = cookie + '; os=osx'
} else { } else {
cookie = 'os=osx' cookie = cookie + '; os=osx'
} }
} else { } else {
cookie = 'os=osx' cookie = 'os=osx'
+1 -7
View File
@@ -13,7 +13,6 @@ const {
buildMetaJson, buildMetaJson,
doUpload, doUpload,
} = require('../util/ncbl') } = require('../util/ncbl')
const { getCookieHeader, hasCookie } = require('../util/index')
module.exports = async (query, request) => { module.exports = async (query, request) => {
// --- 参数校验 --- // --- 参数校验 ---
@@ -33,12 +32,7 @@ module.exports = async (query, request) => {
const sourceName = query.source || 'list' const sourceName = query.source || 'list'
// --- 解析认证上下文 --- // --- 解析认证上下文 ---
const headerCookie = getCookieHeader(query.headers) const rawCookie = query.cookie || ''
const rawCookie = hasCookie(query.cookie)
? query.cookie
: hasCookie(headerCookie)
? headerCookie
: process.env.NETEASE_COOKIE || ''
const cookieObj = parseCookie(rawCookie) const cookieObj = parseCookie(rawCookie)
cookieObj.os = 'pc' cookieObj.os = 'pc'
const ctx = extractContext(cookieObj) const ctx = extractContext(cookieObj)
+1 -1
View File
@@ -110,7 +110,7 @@
"husky": "^9.1.7", "husky": "^9.1.7",
"intelli-espower-loader": "^1.1.0", "intelli-espower-loader": "^1.1.0",
"lint-staged": "^16.4.0", "lint-staged": "^16.4.0",
"mocha": "^11.8.0", "mocha": "^12.0.3",
"nodemon": "^3.1.14", "nodemon": "^3.1.14",
"pkg": "^5.8.1", "pkg": "^5.8.1",
"power-assert": "^1.6.1", "power-assert": "^1.6.1",
+205 -329
View File
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -5932,7 +5932,7 @@ let data = encodeURIComponent(
**调用例子 :** `/fans/group/feed/recommend?fansGroupId=1872529203038486609&size=10&cursor=0` **调用例子 :** `/fans/group/feed/recommend?fansGroupId=1872529203038486609&size=10&cursor=0`
### 每日指定风格歌曲推荐 ## 每日指定风格歌曲推荐
说明 : 调用此接口 , 可获取每日指定风格歌曲推荐 说明 : 调用此接口 , 可获取每日指定风格歌曲推荐
@@ -5940,7 +5940,7 @@ let data = encodeURIComponent(
**调用例子 :** `/recommend/category/songs` **调用例子 :** `/recommend/category/songs`
### 获取每日指定风格歌曲推荐的风格列表 ## 获取每日指定风格歌曲推荐的风格列表
说明 : 调用此接口 , 可获取每日指定风格歌曲推荐的风格列表 说明 : 调用此接口 , 可获取每日指定风格歌曲推荐的风格列表
@@ -5948,7 +5948,7 @@ let data = encodeURIComponent(
**调用例子 :** `/recommend/category/configs` **调用例子 :** `/recommend/category/configs`
### 设置每日指定风格歌曲推荐的风格 ## 设置每日指定风格歌曲推荐的风格
说明 : 调用此接口 , 可设置每日指定风格歌曲推荐的风格 说明 : 调用此接口 , 可设置每日指定风格歌曲推荐的风格
+10 -17
View File
@@ -6,7 +6,7 @@ const request = require('./util/request')
const packageJSON = require('./package.json') const packageJSON = require('./package.json')
const exec = require('child_process').exec const exec = require('child_process').exec
const cache = require('./util/apicache').middleware const cache = require('./util/apicache').middleware
const { cookieToJson, getCookieHeader, hasCookie } = require('./util/index') const { cookieToJson } = require('./util/index')
const fileUpload = require('express-fileupload') const fileUpload = require('express-fileupload')
const decode = require('safe-decode-uri-component') const decode = require('safe-decode-uri-component')
const logger = require('./util/logger.js') const logger = require('./util/logger.js')
@@ -225,9 +225,8 @@ async function constructServer(moduleDefs) {
*/ */
app.use((req, _, next) => { app.use((req, _, next) => {
req.cookies = {} req.cookies = {}
getCookieHeader(req.headers) //;(req.headers.cookie || '').split(/\s*;\s*/).forEach((pair) => { // Polynomial regular expression //
.split(';') ;(req.headers.cookie || '').split(/;\s+|(?<!\s)\s+$/g).forEach((pair) => {
.forEach((pair) => {
let crack = pair.indexOf('=') let crack = pair.indexOf('=')
if (crack < 1 || crack == pair.length - 1) return if (crack < 1 || crack == pair.length - 1) return
req.cookies[decode(pair.slice(0, crack)).trim()] = decode( req.cookies[decode(pair.slice(0, crack)).trim()] = decode(
@@ -292,19 +291,13 @@ async function constructServer(moduleDefs) {
} }
}) })
const queryCookie = req.query && req.query.cookie let query = Object.assign(
const bodyCookie = req.body && req.body.cookie {},
const fileCookie = req.files && req.files.cookie { cookie: req.cookies },
const cookie = hasCookie(fileCookie) req.query,
? fileCookie req.body,
: hasCookie(bodyCookie) req.files,
? bodyCookie )
: hasCookie(queryCookie)
? queryCookie
: req.cookies
const query = Object.assign({}, req.query, req.body, req.files, {
cookie,
})
try { try {
let usedCrypto = '' let usedCrypto = ''
+4 -33
View File
@@ -94,42 +94,15 @@ module.exports = {
// 优化:使用for循环替代forEach,性能更好 // 优化:使用for循环替代forEach,性能更好
for (let i = 0, len = cookieArr.length; i < len; i++) { for (let i = 0, len = cookieArr.length; i < len; i++) {
let item = cookieArr[i] let item = cookieArr[i]
let separator = item.indexOf('=') let arr = item.split('=')
// 只按第一个等号拆分,保留 Cookie 值中的等号 // 优化:使用严格等于
if (separator > 0) { if (arr.length === 2) {
obj[item.slice(0, separator).trim()] = item.slice(separator + 1).trim() obj[arr[0].trim()] = arr[1].trim()
} }
} }
return obj return obj
}, },
hasCookie(cookie) {
if (typeof cookie === 'string') return cookie.length > 0
return (
cookie !== null &&
typeof cookie === 'object' &&
Object.keys(cookie).length > 0
)
},
getCookieHeader(headers) {
if (!headers || typeof headers !== 'object') return ''
if (typeof headers.get === 'function') {
const cookie = headers.get('cookie')
if (typeof cookie === 'string') return cookie
}
const headerName = Object.keys(headers).find(
(name) => name.toLowerCase() === 'cookie',
)
if (!headerName) return ''
const cookie = headers[headerName]
if (Array.isArray(cookie)) return cookie.join('; ')
return typeof cookie === 'string' ? cookie : ''
},
cookieObjToString(cookie) { cookieObjToString(cookie) {
// 优化:使用预绑定的keys函数和for循环 // 优化:使用预绑定的keys函数和for循环
const cookieKeys = keys(cookie) const cookieKeys = keys(cookie)
@@ -253,8 +226,6 @@ const cookieToJsonOptimized = (function() {
function getCookieValue(cookieStr, name) { function getCookieValue(cookieStr, name) {
if (!cookieStr) return '' if (!cookieStr) return ''
if (typeof cookieStr === 'object') return cookieStr[name] || ''
const cookies = '; ' + cookieStr const cookies = '; ' + cookieStr
const parts = cookies.split('; ' + name + '=') const parts = cookies.split('; ' + name + '=')
if (parts.length === 2) return parts.pop().split(';').shift() if (parts.length === 2) return parts.pop().split(';').shift()
+1 -9
View File
@@ -1,15 +1,7 @@
const { getCookieHeader, hasCookie } = require('./index')
const createOption = (query, crypto = '', checkToken = false) => { const createOption = (query, crypto = '', checkToken = false) => {
const headerCookie = getCookieHeader(query.headers)
return { return {
crypto: query.crypto || crypto || '', crypto: query.crypto || crypto || '',
cookie: hasCookie(query.cookie) cookie: query.cookie || process.env.NETEASE_COOKIE,
? query.cookie
: hasCookie(headerCookie)
? headerCookie
: process.env.NETEASE_COOKIE,
ua: query.ua || '', ua: query.ua || '',
proxy: query.proxy, proxy: query.proxy,
realIP: query.realIP, realIP: query.realIP,
+1 -9
View File
@@ -13,8 +13,6 @@ const tmpPath = require('os').tmpdir()
const { const {
cookieToJson, cookieToJson,
cookieObjToString, cookieObjToString,
getCookieHeader,
hasCookie,
toBoolean, toBoolean,
generateRandomChineseIP, generateRandomChineseIP,
} = require('./index') } = require('./index')
@@ -245,19 +243,13 @@ const createRequest = async (uri, data, options) => {
headers['X-Forwarded-For'] = ip headers['X-Forwarded-For'] = ip
} }
let cookie = hasCookie(options.cookie) let cookie = options.cookie || {}
? options.cookie
: getCookieHeader(options.headers)
if (!hasCookie(cookie)) cookie = {}
if (typeof cookie === 'string') { if (typeof cookie === 'string') {
cookie = cookieToJson(cookie) cookie = cookieToJson(cookie)
} }
if (typeof cookie === 'object') { if (typeof cookie === 'object') {
cookie = processCookieObject(cookie, crypto) cookie = processCookieObject(cookie, crypto)
Object.keys(headers).forEach((name) => {
if (name.toLowerCase() === 'cookie') delete headers[name]
})
headers['Cookie'] = cookieObjToString(cookie) headers['Cookie'] = cookieObjToString(cookie)
} }
let url = '' let url = ''