From 13b93fda043374b222b0ccd3c153d2a912d98e34 Mon Sep 17 00:00:00 2001
From: binaryify <binaryify@gmail.com>
Date: Wed, 28 Feb 2018 15:10:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E4=BC=9A=E5=B4=A9=E6=BA=83=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.MD             |  2 +
 package.json             |  2 +-
 router/loginCellphone.js |  2 +-
 test/login.test.js       | 80 ++++++++++++----------------------------
 test/lyric.test.js       | 45 +++++++++++-----------
 5 files changed, 52 insertions(+), 79 deletions(-)

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 5323aac..818aabf 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -1,4 +1,6 @@
 # 更新日志
+### 2.9.2 | 2018.02.28
+修复登录失败会崩溃的问题
 
 ### 2.9.1 | 2018.01.26
 
diff --git a/package.json b/package.json
index b7584a2..037b3f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "NeteaseCloudMusicApi",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "description": "网易云音乐 NodeJS 版 API",
   "scripts": {
     "start": "node app.js",
diff --git a/router/loginCellphone.js b/router/loginCellphone.js
index 9a2ac17..692097f 100644
--- a/router/loginCellphone.js
+++ b/router/loginCellphone.js
@@ -19,7 +19,7 @@ router.get("/", (req, res) => {
     "POST",
     data,
     cookie,
-    (music_req, cookie) => {
+    (music_req, cookie = []) => {
       const cookieStr =
         "appver=1.5.9;os=osx; channel=netease;osver=%E7%89%88%E6%9C%AC%2010.13.2%EF%BC%88%E7%89%88%E5%8F%B7%2017C88%EF%BC%89";
       cookieStr.split(";").forEach(item => {
diff --git a/test/login.test.js b/test/login.test.js
index 5170bd9..a001af6 100644
--- a/test/login.test.js
+++ b/test/login.test.js
@@ -1,71 +1,39 @@
-const assert = require('assert')
-const crypto = require('crypto')
-const { createWebAPIRequest } = require('../util/util')
+const assert = require("assert");
+const crypto = require("crypto");
+const { createWebAPIRequest } = require("../util/util");
 
-console.log('注意:测试登陆需要替换这里的账号密码!!!')
+console.log("注意:测试登陆需要替换这里的账号密码!!!");
 
-describe('测试登录是否正常', () => {
-  it('手机登录 code 应该等于200', done => {
-    const phone = '换成你的手机号'
-    const password = '换成你的密码'
-    let cookie = ''
-    const md5sum = crypto.createHash('md5')
-    md5sum.update(password)
+describe("测试登录是否正常", () => {
+  it("手机登录 code 应该等于200", done => {
+    const phone = "换成你的手机号";
+    const password = "换成你的密码";
+    let cookie = "";
+    const md5sum = crypto.createHash("md5");
+    md5sum.update(password);
     const data = {
       phone: phone,
-      password: md5sum.digest('hex'),
-      rememberLogin: 'true'
-    }
+      password: md5sum.digest("hex"),
+      rememberLogin: "true"
+    };
 
     createWebAPIRequest(
-      'music.163.com',
-      '/weapi/login/cellphone',
-      'POST',
+      "music.163.com",
+      "/weapi/login/cellphone",
+      "POST",
       data,
       cookie,
       (music_req, cookie) => {
-        const result = JSON.parse(music_req)
+        const result = JSON.parse(music_req);
         console.log({
           loginType: result.loginType,
           code: result.code,
           account: result.account
-        })
-        assert(result.code === 200)
-        done()
+        });
+        assert(result.code === 200);
+        done();
       },
       err => done(err)
-    )
-  })
-
-  it('邮箱登录 code 应该等于200', done => {
-    const email = '换成你的163网易邮箱'
-    const password = '换成你的密码'
-    const cookie = ''
-    const md5sum = crypto.createHash('md5')
-    md5sum.update(password)
-    const data = {
-      username: email,
-      password: md5sum.digest('hex'),
-      rememberLogin: 'true'
-    }
-
-    createWebAPIRequest(
-      'music.163.com',
-      '/weapi/login',
-      'POST',
-      data,
-      cookie,
-      (music_req, cookie) => {
-        const result = JSON.parse(music_req)
-        console.log({
-          loginType: result.loginType,
-          code: result.code,
-          account: result.account
-        })
-        assert(result.code === 200)
-        done()
-      },
-      err => done(err)
-    )
-  })
-})
+    );
+  });
+});
diff --git a/test/lyric.test.js b/test/lyric.test.js
index c4f7c67..128d86b 100644
--- a/test/lyric.test.js
+++ b/test/lyric.test.js
@@ -1,22 +1,25 @@
-const assert = require('assert')
-const crypto = require('crypto')
-const { createRequest } = require('../util/util')
+const assert = require("assert");
+const crypto = require("crypto");
+const { createWebAPIRequest } = require("../util/util");
 
-describe('测试获取歌词是否正常', () => {
-  it('数据应该有 lrc 字段', done => {
-    const id = 347230
-    createRequest(
-      '/api/song/lyric?os=osx&id=' + id + '&lv=-1&kv=-1&tv=-1',
-      'GET',
-      null
-    )
-      .then(result => {
-        // console.log(JSON.parse(result).lrc)
-        assert(typeof JSON.parse(result).lrc !== 'undefined')
-        done()
-      })
-      .catch(err => {
-        done(err)
-      })
-  })
-})
+describe("测试获取歌词是否正常", () => {
+  it("数据应该有 lrc 字段", done => {
+    const cookie = "";
+    const data = {};
+    const id = 347230;
+    createWebAPIRequest(
+      "music.163.com",
+      "/weapi/song/lyric?os=osx&id=" + id + "&lv=-1&kv=-1&tv=-1",
+      "POST",
+      data,
+      cookie,
+      music_req => {
+        console.log(music_req);
+        assert(typeof JSON.parse(music_req).lrc !== "undefined");
+        done();
+        // res.send(music_req)
+      },
+      err => res.status(502).send("fetch error")
+    );
+  });
+});
-- 
GitLab