From dd9ec456bf8813504d3069d56ef0b0a3470fe2c0 Mon Sep 17 00:00:00 2001
From: overwriter <9856mmm@gmail.com>
Date: Sat, 3 Aug 2024 20:00:25 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=AF=B7=E6=B1=82=E5=A4=B4?=
 =?UTF-8?q?=E6=97=A0=E9=9C=80=E4=BC=A0=E9=80=92content-type=E3=80=81os?=
 =?UTF-8?q?=E5=92=8Cappver?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 util/request.js | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/util/request.js b/util/request.js
index 382e3d3..9ab0320 100644
--- a/util/request.js
+++ b/util/request.js
@@ -8,7 +8,7 @@ const tunnel = require('tunnel')
 const fs = require('fs')
 const path = require('path')
 const tmpPath = require('os').tmpdir()
-const { cookieToJson, cookieObjToString } = require('./index')
+const { cookieToJson, cookieObjToString, toBoolean } = require('./index')
 const anonymous_token = fs.readFileSync(
   path.resolve(tmpPath, './anonymous_token'),
   'utf-8',
@@ -34,13 +34,7 @@ const createRequest = (uri, data, options) => {
   const cookie = options.cookie || {}
   return new Promise((resolve, reject) => {
     options.headers = options.headers || {}
-    let headers = {
-      ...options.headers,
-      'User-Agent': options.ua || chooseUserAgent(options.uaType),
-      'Content-Type': 'application/x-www-form-urlencoded',
-      os: cookie.os || 'ios',
-      appver: cookie.appver || (cookie.os != 'pc' ? iosAppVersion : ''),
-    }
+    let headers = options.headers
     let ip = options.realIP || options.ip || ''
     // console.log(ip)
     if (ip) {
@@ -91,7 +85,7 @@ const createRequest = (uri, data, options) => {
     // 根据加密方式加密请求数据；目前任意uri都支持四种加密方式
     switch (crypto) {
       case 'weapi':
-        headers['Referer'] = 'https://music.163.com'
+        headers['Referer'] = APP_CONF.domain
         headers['User-Agent'] = options.ua || chooseUserAgent('pc')
         data.csrf_token = csrfToken
         encryptData = encrypt.weapi(data)
@@ -136,8 +130,9 @@ const createRequest = (uri, data, options) => {
               encodeURIComponent(key) + '=' + encodeURIComponent(header[key]),
           )
           .join('; ')
+        headers['User-Agent'] = options.ua || chooseUserAgent(options.uaType)
 
-        let eapi = () => {
+        if (crypto === 'eapi') {
           // 使用eapi加密
           data.header = header
           data.e_r =
@@ -146,19 +141,14 @@ const createRequest = (uri, data, options) => {
               : data.e_r != undefined
               ? data.e_r
               : APP_CONF.encryptResponse // 用于加密接口返回值
+          data.e_r = toBoolean(data.e_r)
           encryptData = encrypt.eapi(uri, data)
           url = APP_CONF.apiDomain + '/eapi/' + uri.substr(5)
-        }
-        let api = () => {
+        } else if (crypto === 'api') {
           // 不使用任何加密
           url = APP_CONF.apiDomain + uri
           encryptData = data
         }
-        if (crypto === 'eapi') {
-          eapi()
-        } else if (crypto === 'api') {
-          api()
-        }
         break
 
       default: