Merge pull request #292 from 70CentsApple/main

fix: 修复一些 cookie 传递问题

interface.d.ts

@@ -1,5 +1,6 @@
 export interface RequestBaseConfig {
   cookie?: string
+  headers?: Record<string, string | string[]>
   realIP?: string // IPv4/IPv6 filled in X-Real-IP
   proxy?: string // HTTP proxy
   randomCNIP?: boolean // Whether to use a random Chinese IP address filled in X-Real-IP

main.js

@@ -25,9 +25,7 @@ moduleFiles.forEach((file) => {
 
   obj[fn] = function (data = {}) {
     const cookie =
-      typeof data.cookie === 'string'
-        ? cookieToJson(data.cookie)
-        : data.cookie || {}
+      typeof data.cookie === 'string' ? cookieToJson(data.cookie) : data.cookie
 
     return fileModule(
       {

module/login_qr_create.js

@@ -1,10 +1,15 @@
 const QRCode = require('qrcode')
-const { generateChainId } = require('../util/index')
+const { generateChainId, getCookieHeader, hasCookie } = require('../util/index')
 
 module.exports = (query) => {
   return new Promise(async (resolve) => {
     const platform = query.platform || 'pc'
-    const cookie = query.cookie || ''
+    const headerCookie = getCookieHeader(query.headers)
+    const cookie = hasCookie(query.cookie)
+      ? query.cookie
+      : hasCookie(headerCookie)
+        ? headerCookie
+        : ''
 
     // 构建基础URL
     let url = `https://music.163.com/login?codekey=${query.key}`

module/scrobble.js

@@ -1,18 +1,26 @@
 // 听歌打卡
 
 const createOption = require('../util/option.js')
+const { getCookieHeader, hasCookie } = require('../util/index')
 const { APP_CONF } = require('../util/config.json')
 const DOMAIN = APP_CONF.clDomian
 module.exports = async (query, request) => {
   // 注入 os=osx 的 cookie
-  let cookie = query.cookie || ''
+  const headerCookie = getCookieHeader(query.headers)
+  let cookie = hasCookie(query.cookie)
+    ? query.cookie
+    : hasCookie(headerCookie)
+      ? headerCookie
+      : process.env.NETEASE_COOKIE || ''
   if (typeof cookie === 'object') {
     cookie = Object.assign({ os: 'osx' }, cookie)
   } else if (typeof cookie === 'string') {
     if (cookie.indexOf('os=') > -1) {
       cookie = cookie.replace(/os=[^;]+/g, 'os=osx')
-    } else {
+    } else if (cookie) {
       cookie = cookie + '; os=osx'
+    } else {
+      cookie = 'os=osx'
     }
   } else {
     cookie = 'os=osx'

module/scrobble_v1.js

@@ -13,6 +13,7 @@ const {
   buildMetaJson,
   doUpload,
 } = require('../util/ncbl')
+const { getCookieHeader, hasCookie } = require('../util/index')
 
 module.exports = async (query, request) => {
   // --- 参数校验 ---
@@ -32,7 +33,12 @@ module.exports = async (query, request) => {
   const sourceName = query.source || 'list'
 
   // --- 解析认证上下文 ---
-  const rawCookie = query.cookie || ''
+  const headerCookie = getCookieHeader(query.headers)
+  const rawCookie = hasCookie(query.cookie)
+    ? query.cookie
+    : hasCookie(headerCookie)
+      ? headerCookie
+      : process.env.NETEASE_COOKIE || ''
   const cookieObj = parseCookie(rawCookie)
   cookieObj.os = 'pc'
   const ctx = extractContext(cookieObj)

public/docs/home.md

@@ -5932,7 +5932,7 @@ let data = encodeURIComponent(
 
 **调用例子 :** `/fans/group/feed/recommend?fansGroupId=1872529203038486609&size=10&cursor=0`
 
-## 每日指定风格歌曲推荐
+### 每日指定风格歌曲推荐
 
 说明 : 调用此接口 , 可获取每日指定风格歌曲推荐
 
@@ -5940,7 +5940,7 @@ let data = encodeURIComponent(
 
 **调用例子 :** `/recommend/category/songs`
 
-## 获取每日指定风格歌曲推荐的风格列表
+### 获取每日指定风格歌曲推荐的风格列表
 
 说明 : 调用此接口 , 可获取每日指定风格歌曲推荐的风格列表
 
@@ -5948,7 +5948,7 @@ let data = encodeURIComponent(
 
 **调用例子 :** `/recommend/category/configs`
 
-## 设置每日指定风格歌曲推荐的风格
+### 设置每日指定风格歌曲推荐的风格
 
 说明 : 调用此接口 , 可设置每日指定风格歌曲推荐的风格
 

server.js

@@ -6,7 +6,7 @@ const request = require('./util/request')
 const packageJSON = require('./package.json')
 const exec = require('child_process').exec
 const cache = require('./util/apicache').middleware
-const { cookieToJson } = require('./util/index')
+const { cookieToJson, getCookieHeader, hasCookie } = require('./util/index')
 const fileUpload = require('express-fileupload')
 const decode = require('safe-decode-uri-component')
 const logger = require('./util/logger.js')
@@ -225,14 +225,15 @@ async function constructServer(moduleDefs) {
    */
   app.use((req, _, next) => {
     req.cookies = {}
-    //;(req.headers.cookie || '').split(/\s*;\s*/).forEach((pair) => { //  Polynomial regular expression //
-    ;(req.headers.cookie || '').split(/;\s+|(?<!\s)\s+$/g).forEach((pair) => {
-      let crack = pair.indexOf('=')
-      if (crack < 1 || crack == pair.length - 1) return
-      req.cookies[decode(pair.slice(0, crack)).trim()] = decode(
-        pair.slice(crack + 1),
-      ).trim()
-    })
+    getCookieHeader(req.headers)
+      .split(';')
+      .forEach((pair) => {
+        let crack = pair.indexOf('=')
+        if (crack < 1 || crack == pair.length - 1) return
+        req.cookies[decode(pair.slice(0, crack)).trim()] = decode(
+          pair.slice(crack + 1),
+        ).trim()
+      })
     next()
   })
 
@@ -291,13 +292,19 @@ async function constructServer(moduleDefs) {
         }
       })
 
-      let query = Object.assign(
-        {},
-        { cookie: req.cookies },
-        req.query,
-        req.body,
-        req.files,
-      )
+      const queryCookie = req.query && req.query.cookie
+      const bodyCookie = req.body && req.body.cookie
+      const fileCookie = req.files && req.files.cookie
+      const cookie = hasCookie(fileCookie)
+        ? fileCookie
+        : hasCookie(bodyCookie)
+          ? bodyCookie
+          : hasCookie(queryCookie)
+            ? queryCookie
+            : req.cookies
+      const query = Object.assign({}, req.query, req.body, req.files, {
+        cookie,
+      })
 
       try {
         let usedCrypto = ''

util/index.js

@@ -94,15 +94,42 @@ module.exports = {
     // 优化：使用for循环替代forEach，性能更好
     for (let i = 0, len = cookieArr.length; i < len; i++) {
       let item = cookieArr[i]
-      let arr = item.split('=')
-      // 优化：使用严格等于
-      if (arr.length === 2) {
-        obj[arr[0].trim()] = arr[1].trim()
+      let separator = item.indexOf('=')
+      // 只按第一个等号拆分，保留 Cookie 值中的等号
+      if (separator > 0) {
+        obj[item.slice(0, separator).trim()] = item.slice(separator + 1).trim()
       }
     }
     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) {
     // 优化：使用预绑定的keys函数和for循环
     const cookieKeys = keys(cookie)
@@ -226,6 +253,8 @@ const cookieToJsonOptimized = (function() {
 function getCookieValue(cookieStr, name) {
   if (!cookieStr) return ''
 
+  if (typeof cookieStr === 'object') return cookieStr[name] || ''
+
   const cookies = '; ' + cookieStr
   const parts = cookies.split('; ' + name + '=')
   if (parts.length === 2) return parts.pop().split(';').shift()

util/option.js

@@ -1,7 +1,15 @@
+const { getCookieHeader, hasCookie } = require('./index')
+
 const createOption = (query, crypto = '', checkToken = false) => {
+  const headerCookie = getCookieHeader(query.headers)
+
   return {
     crypto: query.crypto || crypto || '',
-    cookie: query.cookie || process.env.NETEASE_COOKIE,
+    cookie: hasCookie(query.cookie)
+      ? query.cookie
+      : hasCookie(headerCookie)
+        ? headerCookie
+        : process.env.NETEASE_COOKIE,
     ua: query.ua || '',
     proxy: query.proxy,
     realIP: query.realIP,

util/request.js

@@ -13,6 +13,8 @@ const tmpPath = require('os').tmpdir()
 const {
   cookieToJson,
   cookieObjToString,
+  getCookieHeader,
+  hasCookie,
   toBoolean,
   generateRandomChineseIP,
 } = require('./index')
@@ -243,13 +245,19 @@ const createRequest = async (uri, data, options) => {
       headers['X-Forwarded-For'] = ip
     }
 
-    let cookie = options.cookie || {}
+    let cookie = hasCookie(options.cookie)
+      ? options.cookie
+      : getCookieHeader(options.headers)
+    if (!hasCookie(cookie)) cookie = {}
     if (typeof cookie === 'string') {
       cookie = cookieToJson(cookie)
     }
 
     if (typeof cookie === 'object') {
       cookie = processCookieObject(cookie, crypto)
+      Object.keys(headers).forEach((name) => {
+        if (name.toLowerCase() === 'cookie') delete headers[name]
+      })
       headers['Cookie'] = cookieObjToString(cookie)
     }
     let url = ''