From e410bef0457b1667044c8314bb290cd3d3b69b64 Mon Sep 17 00:00:00 2001 From: binaryify Date: Wed, 26 Sep 2018 20:19:01 +0800 Subject: [PATCH 1/5] v2.20.3 --- CHANGELOG.MD | 14 ++++++ README.MD | 5 ++- docs/README.md | 13 +++++- package.json | 2 +- util/util.js | 115 +++++++++++++++++++++++++++---------------------- 5 files changed, 94 insertions(+), 55 deletions(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index d47afcd..d3846df 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -1,6 +1,20 @@ # 更新日志 +### 2.20.3 | 2018.09.26 + +- 增加退出登陆接口 +- 修正 /check/music 的检查逻辑 +- 优化 Cookies 设置 +- 重构单元测试 + + [by @nondanee](https://github.com/nondanee) + +- 增加 301 需要登陆提示信息 + +- 更新文档 + ### 2.20.2 | 2018.09.22 + 增加热门评论和视频评论接口,更新文档 ### 2.20.1 | 2018.09.17 diff --git a/README.MD b/README.MD index 61ae478..73f1973 100644 --- a/README.MD +++ b/README.MD @@ -70,7 +70,7 @@ 48. 独家放送 49. mv 排行 50. 获取 mv 数据 -51. 播放 mv +51. 播放 mv/视频 52. 排行榜 53. 歌手榜 54. 云盘 @@ -96,6 +96,9 @@ 74. 登录状态 75. 获取视频数据 76. 发送/删除评论 +77. 热门评论 +78. 视频评论 +79. 退出登录 ## 环境要求 diff --git a/docs/README.md b/docs/README.md index 606916f..5c1709c 100644 --- a/docs/README.md +++ b/docs/README.md @@ -94,6 +94,7 @@ 76. 发送/删除评论 77. 热门评论 78. 视频评论 +79. 退出登录 ## 安装 @@ -233,6 +234,12 @@ Cookies **调用例子 :** `/login/refresh` +### 退出登录 + +说明 : 调用此接口 , 可退出登录 + +**调用例子 :** `/logout` + ### 登录状态 说明 : 调用此接口,可获取登录状态 @@ -781,7 +788,8 @@ mp3url 不能直接用 , 可通过 `/music/url` 接口传入歌曲 id 获取具 **调用例子 :** `/comment/video?id=89ADDE33C0AAE8EC14B99F6750DB954D` ### 热门评论 -说明 : 调用此接口 , 传入 type, 资源 id 可获得对应资源热门评论 ( 不需要登录 ) + +说明 : 调用此接口 , 传入 type, 资源 id 可获得对应资源热门评论 ( 不需要登录 ) **必选参数 :** @@ -797,6 +805,7 @@ mp3url 不能直接用 , 可通过 `/music/url` 接口传入歌曲 id 获取具 4: 电台 5: 视频 ``` + **接口地址 :** `/comment/hot` **调用例子 :** `/comment/hot?id=186016&type=0` @@ -859,7 +868,7 @@ mp3url 不能直接用 , 可通过 `/music/url` 接口传入歌曲 id 获取具 2. 删除评论 **必选参数** - `action`:0 删除 + `action`:0 删除 `tpye`: 数字,资源类型,对应歌曲,mv,专辑,歌单,电台,视频对应以下类型 diff --git a/package.json b/package.json index f97631f..531014d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "NeteaseCloudMusicApi", - "version": "2.20.2", + "version": "2.20.3", "description": "网易云音乐 NodeJS 版 API", "scripts": { "start": "node app.js", diff --git a/util/util.js b/util/util.js index 65243d3..c514644 100644 --- a/util/util.js +++ b/util/util.js @@ -1,33 +1,33 @@ -const Encrypt = require("./crypto.js"); -const request = require("request"); -const queryString = require("querystring"); +const Encrypt = require('./crypto.js') +const request = require('request') +const queryString = require('querystring') -request.debug = true; +request.debug = true function randomUserAgent() { const userAgentList = [ - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36", - "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1", - "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1", - "Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Mobile Safari/537.36", - "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Mobile Safari/537.36", - "Mozilla/5.0 (Linux; Android 5.1.1; Nexus 6 Build/LYZ28E) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Mobile Safari/537.36", - "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_2 like Mac OS X) AppleWebKit/603.2.4 (KHTML, like Gecko) Mobile/14F89;GameHelper", - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/603.2.4 (KHTML, like Gecko) Version/10.1.1 Safari/603.2.4", - "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0 like Mac OS X) AppleWebKit/602.1.38 (KHTML, like Gecko) Version/10.0 Mobile/14A300 Safari/602.1", - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36", - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:46.0) Gecko/20100101 Firefox/46.0", - "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:46.0) Gecko/20100101 Firefox/46.0", - "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)", - "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0)", - "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)", - "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Win64; x64; Trident/6.0)", - "Mozilla/5.0 (Windows NT 6.3; Win64, x64; Trident/7.0; rv:11.0) like Gecko", - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/13.10586", - "Mozilla/5.0 (iPad; CPU OS 10_0 like Mac OS X) AppleWebKit/602.1.38 (KHTML, like Gecko) Version/10.0 Mobile/14A300 Safari/602.1" - ]; - const num = Math.floor(Math.random() * userAgentList.length); - return userAgentList[num]; + 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', + 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1', + 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1', + 'Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Mobile Safari/537.36', + 'Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Mobile Safari/537.36', + 'Mozilla/5.0 (Linux; Android 5.1.1; Nexus 6 Build/LYZ28E) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Mobile Safari/537.36', + 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_2 like Mac OS X) AppleWebKit/603.2.4 (KHTML, like Gecko) Mobile/14F89;GameHelper', + 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/603.2.4 (KHTML, like Gecko) Version/10.1.1 Safari/603.2.4', + 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_0 like Mac OS X) AppleWebKit/602.1.38 (KHTML, like Gecko) Version/10.0 Mobile/14A300 Safari/602.1', + 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36', + 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:46.0) Gecko/20100101 Firefox/46.0', + 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:46.0) Gecko/20100101 Firefox/46.0', + 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)', + 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0)', + 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)', + 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Win64; x64; Trident/6.0)', + 'Mozilla/5.0 (Windows NT 6.3; Win64, x64; Trident/7.0; rv:11.0) like Gecko', + 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/13.10586', + 'Mozilla/5.0 (iPad; CPU OS 10_0 like Mac OS X) AppleWebKit/602.1.38 (KHTML, like Gecko) Version/10.0 Mobile/14A300 Safari/602.1' + ] + const num = Math.floor(Math.random() * userAgentList.length) + return userAgentList[num] } function createWebAPIRequest( @@ -39,52 +39,65 @@ function createWebAPIRequest( callback, errorCallback ) { - const csrfToken = cookie.match(/_csrf=([^(;|$)]+)/); - if (csrfToken) - data.csrf_token = csrfToken[1]; - else - data.csrf_token = ""; + const csrfToken = cookie.match(/_csrf=([^(;|$)]+)/) + if (csrfToken) data.csrf_token = csrfToken[1] + else data.csrf_token = '' - const proxy = cookie.split("__proxy__")[1]; - cookie = cookie.split("__proxy__")[0]; + const proxy = cookie.split('__proxy__')[1] + cookie = cookie.split('__proxy__')[0] - const encryptedData = Encrypt(data); + const encryptedData = Encrypt(data) const options = { url: `http://${host}${path}`, method: method, headers: { - "Accept": "*/*", - "Accept-Language": "zh-CN,zh;q=0.8,gl;q=0.6,zh-TW;q=0.4", - "Connection": "keep-alive", - "Content-Type": "application/x-www-form-urlencoded", - "Referer": "http://music.163.com", - "Host": "music.163.com", - "Cookie": cookie, - "User-Agent": randomUserAgent() + Accept: '*/*', + 'Accept-Language': 'zh-CN,zh;q=0.8,gl;q=0.6,zh-TW;q=0.4', + Connection: 'keep-alive', + 'Content-Type': 'application/x-www-form-urlencoded', + Referer: 'http://music.163.com', + Host: 'music.163.com', + Cookie: cookie, + 'User-Agent': randomUserAgent() }, body: queryString.stringify({ params: encryptedData.params, encSecKey: encryptedData.encSecKey }), proxy: proxy - }; + } console.log( `[request] ${options.method} ${options.url} proxy:${options.proxy}` - ); + ) request(options, function(error, res, body) { if (error) { - console.error(error); - errorCallback(error); + console.error(error) + errorCallback(error) } else { - let cookie = res.headers["set-cookie"] || []; - cookie = cookie.map(x => x.replace(/\s*Domain=[^(;|$)]+;*/, "")); - callback(body, cookie); + let cookie = res.headers['set-cookie'] || [] + cookie = cookie.map(x => x.replace(/\s*Domain=[^(;|$)]+;*/, '')) + try { + const response = JSON.parse(body) + if (response.code == '301') { + callback( + JSON.stringify({ + ...response, + msg: '需要登陆' + }), + cookie + ) + } else { + callback(body, cookie) + } + } catch (err) { + callback(body, cookie) + } } - }); + }) } module.exports = { request, createWebAPIRequest -}; +} From 23b9a0e72f05d651d259b2d7f46f59bf519dfb1c Mon Sep 17 00:00:00 2001 From: binaryify Date: Thu, 27 Sep 2018 00:47:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/README.md b/docs/README.md index 5c1709c..3bdff74 100644 --- a/docs/README.md +++ b/docs/README.md @@ -532,6 +532,16 @@ category Code 取值: **调用例子 :** `/top/playlist/highquality?limit=30` +### 相关歌单推荐 + +说明 : 调用此接口,传入歌单 id 可获取相关歌单(对应页面 [https://music.163.com/#/playlist?id=1](https://music.163.com/#/playlist?id=1)) + +**必选参数 :** `id` : 歌单 id + +**接口地址 :** `/related/playlist` + +**调用例子 :** `/related/playlist?id=1` + ### 获取歌单详情 说明 : 歌单能看到歌单名字 , 但看不到具体歌单内容 , 调用此接口 , 传入歌单 id, 可 From 57c3b0f30787b4e549d1f4505e0a51d8d94ee91d Mon Sep 17 00:00:00 2001 From: binaryify Date: Thu, 27 Sep 2018 21:52:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E8=B5=9E?= =?UTF-8?q?=E9=97=AE=E9=A2=98,=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.MD | 4 ++++ docs/README.md | 3 +-- package.json | 2 +- router/comment_like.js | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index d3846df..d8f7646 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -1,5 +1,9 @@ # 更新日志 +### 2.20.4 | 2018.09.27 + +修复点赞失效的问题 + ### 2.20.3 | 2018.09.26 - 增加退出登陆接口 diff --git a/docs/README.md b/docs/README.md index 3bdff74..a1df98f 100644 --- a/docs/README.md +++ b/docs/README.md @@ -844,8 +844,7 @@ mp3url 不能直接用 , 可通过 `/music/url` 接口传入歌曲 id 获取具 **接口地址 :** `comment/like` -**调用例子 :** `/comment/like?id=186016&cid=4956438&t=1&type=0` 对应给晴天最热门 -的那条评论点赞 +**调用例子 :** `/comment/like?id=29178366&cid=12840183&t=1&type=0` 对应给 [https://music.163.com/#/song?id=29178366](https://music.163.com/#/song?id=29178366) 最热门的评论点赞 ### 发送/删除评论 diff --git a/package.json b/package.json index 531014d..fb1355c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "NeteaseCloudMusicApi", - "version": "2.20.3", + "version": "2.20.4", "description": "网易云音乐 NodeJS 版 API", "scripts": { "start": "node app.js", diff --git a/router/comment_like.js b/router/comment_like.js index ff5706e..041568f 100644 --- a/router/comment_like.js +++ b/router/comment_like.js @@ -1,6 +1,7 @@ //comment like module.exports = (req, res, createWebAPIRequest, request) => { - const cookie = req.get('Cookie') ? req.get('Cookie') : '' + let cookie = req.get('Cookie') ? req.get('Cookie') : '' + cookie += ';os=pc;' const cid = req.query.cid //评论 id const id = req.query.id const typeMap = { From 6fead9a79ed265914afd410df2f1ed4f362c1f9e Mon Sep 17 00:00:00 2001 From: kouchao Date: Sat, 29 Sep 2018 08:51:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9D=9E=E6=B3=95?= =?UTF-8?q?=E5=8F=82=E6=95=B0403=20#335,=20=E4=BF=AE=E5=A4=8D=E4=BB=A3?= =?UTF-8?q?=E7=90=86=E9=94=99=E8=AF=AF=20#334?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- router/comment_hot.js | 2 +- router/comment_like.js | 2 +- util/util.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/router/comment_hot.js b/router/comment_hot.js index 4977a52..88f643a 100644 --- a/router/comment_hot.js +++ b/router/comment_hot.js @@ -1,6 +1,6 @@ module.exports = (req, res, createWebAPIRequest) => { let cookie = req.get('Cookie') ? req.get('Cookie') : '' - cookie += ';os=pc;' + cookie = 'os=pc;' + cookie const rid = req.query.id const typeMap = { 0: 'R_SO_4_', // 歌曲 diff --git a/router/comment_like.js b/router/comment_like.js index 041568f..bcb62ce 100644 --- a/router/comment_like.js +++ b/router/comment_like.js @@ -1,7 +1,7 @@ //comment like module.exports = (req, res, createWebAPIRequest, request) => { let cookie = req.get('Cookie') ? req.get('Cookie') : '' - cookie += ';os=pc;' + cookie = 'os=pc;' + cookie const cid = req.query.cid //评论 id const id = req.query.id const typeMap = { diff --git a/util/util.js b/util/util.js index c514644..acc8ab2 100644 --- a/util/util.js +++ b/util/util.js @@ -39,13 +39,13 @@ function createWebAPIRequest( callback, errorCallback ) { + const proxy = cookie.split('__proxy__')[1] + cookie = cookie.split('__proxy__')[0] + const csrfToken = cookie.match(/_csrf=([^(;|$)]+)/) if (csrfToken) data.csrf_token = csrfToken[1] else data.csrf_token = '' - const proxy = cookie.split('__proxy__')[1] - cookie = cookie.split('__proxy__')[0] - const encryptedData = Encrypt(data) const options = { url: `http://${host}${path}`, From 701bfdbd24f67e5307d7d47a2b5713ac7bb0e553 Mon Sep 17 00:00:00 2001 From: binaryify Date: Sat, 29 Sep 2018 09:10:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9D=9E=E6=B3=95?= =?UTF-8?q?=E5=8F=82=E6=95=B0403=20#335,=20=E4=BF=AE=E5=A4=8D=E4=BB=A3?= =?UTF-8?q?=E7=90=86=E9=94=99=E8=AF=AF=20#334?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.MD | 2 ++ package.json | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index d8f7646..16e5072 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -1,4 +1,6 @@ # 更新日志 +### 2.20.5 | 2018.09.29 +修复非法参数403 #335, 修复代理错误 #334 ### 2.20.4 | 2018.09.27 diff --git a/package.json b/package.json index fb1355c..d56c0f0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "NeteaseCloudMusicApi", - "version": "2.20.4", + "version": "2.20.5", "description": "网易云音乐 NodeJS 版 API", "scripts": { "start": "node app.js", @@ -25,4 +25,4 @@ "mocha": "^5.1.1", "power-assert": "^1.5.0" } -} +} \ No newline at end of file