From a26ab583f3f513cee06cdd0955a4bcbd316b5c1c Mon Sep 17 00:00:00 2001
From: Nzix <iminezn5656@outlook.com>
Date: Tue, 25 Sep 2018 19:38:10 +0800
Subject: [PATCH] modify regular expression

---
 router/banner.js       | 8 +++-----
 router/login_status.js | 6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/router/banner.js b/router/banner.js
index 3f6c7fd..d54c39d 100644
--- a/router/banner.js
+++ b/router/banner.js
@@ -3,9 +3,8 @@ module.exports = (req, res, createWebAPIRequest, request) => {
     url: "http://music.163.com/discover",
     method: "GET",
     headers: {
-      Referer: "http://music.163.com",
-      "User-Agent":
-        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3380.0 Safari/537.36"
+      "Referer": "http://music.163.com",
+      "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3380.0 Safari/537.36"
     }
   };
   request(options, (error, response, body) => {
@@ -13,8 +12,7 @@ module.exports = (req, res, createWebAPIRequest, request) => {
       res.status(502).send("fetch error");
     } else {
       try {
-        const pattern = /<script[^>]*>\s*window\.Gbanners\s*=\s*([^;]+?);\s*<\/script>/g;
-        const banners = pattern.exec(body)[1];
+        const banners = /Gbanners\s*=\s*([^;]+);/.exec(body)[1];
         res.send(JSON.stringify(eval(`({code:200,banners:${banners}})`)));
       } catch (error) {
         res.status(502).send("fetch error");
diff --git a/router/login_status.js b/router/login_status.js
index 4b6bb93..7c46e61 100644
--- a/router/login_status.js
+++ b/router/login_status.js
@@ -7,10 +7,10 @@ module.exports = (req, res, createWebAPIRequest, request) => {
     "GET",
     {},
     cookie,
-    (music_req, cookie) => {
+    music_req => {
       try {
-        var profile = (/var GUser=([^;]+);/g).exec(music_req)[1];
-        var bindings = (/var GBinds=([^;]+);/g).exec(music_req)[1];
+        var profile = /GUser\s*=\s*([^;]+);/.exec(music_req)[1];
+        var bindings = /GBinds\s*=\s*([^;]+);/.exec(music_req)[1];
         profile = eval(`(${profile})`);
         bindings = eval(`(${bindings})`);
         res.send({code: 200, profile: profile, bindings: bindings});
-- 
GitLab