@sansenjian/qq-music-api 1.0.6 → 2.0.0

package/scripts/build-images.js

@@ -1,36 +1,36 @@
-const {exec} = require('child_process');
-const { version, author } = require('../package.json');
-
-const isLocal = process.argv[2] === 'local';
-
-console.log(`------------ ${isLocal ? 'Local' : 'Remote'} Docker Build Images Start ------------\n`);
-
-// const run = 'docker run -d --name qq-music-api -p 3200:3200 qq-music-api'
-const image = `${isLocal ? '' : `${author.toLowerCase()}/`}qq-music-api:${version}`
-const cmd = isLocal
-	? `docker build -t ${image} .`
-	: `docker image tag qq-music-api:${version} ${image}`;
-
-console.log('cmd:', cmd, '\n');
-
-exec(cmd, {}, (err, stdout, stderr) => {
-	if (err) {
-		console.log(err);
-		return;
-	}
-	console.log(stdout, stderr);
-	console.log(`------------ ${isLocal ? 'Local' : 'Remote'} Docker Build Images End ------------\n`);
-	if (!isLocal) {
-		const pushCmd = `docker image push ${image}`;
-		console.log('pushCmd:', pushCmd, '\n');
-		console.log(`------------ ${isLocal ? 'Local' : 'Remote'} Docker Push Images Start ------------\n`);
-		exec(pushCmd, {}, (err, stdout, stderr) => {
-			if (err) {
-				console.log(err);
-				return;
-			}
-			console.log(stdout, stderr);
-			console.log(`------------ ${isLocal ? 'Local' : 'Remote'} Docker Push Images End ------------\n`);
-		});
-	}
-});
+const {exec} = require('child_process');
+const { version, author } = require('../package.json');
+
+const isLocal = process.argv[2] === 'local';
+
+console.log(`------------ ${isLocal ? 'Local' : 'Remote'} Docker Build Images Start ------------\n`);
+
+// const run = 'docker run -d --name qq-music-api -p 3200:3200 qq-music-api'
+const image = `${isLocal ? '' : `${author.toLowerCase()}/`}qq-music-api:${version}`
+const cmd = isLocal
+	? `docker build -t ${image} .`
+	: `docker image tag qq-music-api:${version} ${image}`;
+
+console.log('cmd:', cmd, '\n');
+
+exec(cmd, {}, (err, stdout, stderr) => {
+	if (err) {
+		console.log(err);
+		return;
+	}
+	console.log(stdout, stderr);
+	console.log(`------------ ${isLocal ? 'Local' : 'Remote'} Docker Build Images End ------------\n`);
+	if (!isLocal) {
+		const pushCmd = `docker image push ${image}`;
+		console.log('pushCmd:', pushCmd, '\n');
+		console.log(`------------ ${isLocal ? 'Local' : 'Remote'} Docker Push Images Start ------------\n`);
+		exec(pushCmd, {}, (err, stdout, stderr) => {
+			if (err) {
+				console.log(err);
+				return;
+			}
+			console.log(stdout, stderr);
+			console.log(`------------ ${isLocal ? 'Local' : 'Remote'} Docker Push Images End ------------\n`);
+		});
+	}
+});

package/scripts/commit-push.sh

@@ -1,103 +1,103 @@
-###
- # @Author: Rainy
- # @Date: 2020-05-24 13:05:40
- # @LastEditors: Rainy
- # @LastEditTime: 2020-05-24 13:06:02
-### 
-
-#!/usr/bin/env bash
-
-echo "------------ commit push shell run ------------"
-
-read -p "Input your commit msg (*): " msg
-read -p "Amend commit(Y, y, default: N): " amend
-read -p "Need pull current branch(Y, y, default: N): " pull
-
-len=120
-curBranch=$(git branch | awk '/\*/ { print $2; }')
-
-# start reg
-msgRegLower='^\s*(feat|fix|docs|style|chore|build|ci|perf|refactor|revert|test|temp|update)\s*\:*\s*'
-msgRegUpper='^\s*(Feat|Fix|Docs|Style|Chore|Build|Ci|Perf|Refactor|Revert|Test|Temp|Update)\s*\:*\s*'
-
-# 另一种获取当前 branch_name 的方法
-# git symbolic-ref --short HEAD
-
-echo "Log: Cureren branch is ${curBranch}"
-
-if [[ $pull = "Y" || $pull = "y" ]];then
-
-    read -p "Need pull branch(default: current branch, eg: master): " branch
-
-fi
-
-if [ -n "$msg" ];then
-
-    echo "Log: Commit msg: $msg"
-
-    if [ ${#msg} -gt $len ];then
-        echo "Error: msg length must less than $len"
-        exit 1
-    fi
-
-    if [[ "$msg" =~ $msgRegLower || "$msg" =~ $msgRegUpper ]];then
-
-        git add .
-        
-        if [[ $amend = "Y" || $amend = "y" ]];then
-            echo "Log: Amending message commit"
-            git commit --amend -m "$msg" || exit 1
-        else
-            echo "Log: Commiting"
-            git commit -m "$msg" || exit 1
-        fi
-
-        if [[ $pull = "Y" || $pull = "y" ]];then
-
-            if [ -n "$branch" ];then
-
-            echo "Log: Pulling branch is $branch"
-
-            fi
-
-            branch=${curBranch}
-
-            echo "Log: Pulling ${branch} from remote"
-            git pull origin ${branch} || exit 1
-
-        else
-
-            branch=${curBranch}
-
-            echo "Log: Current branch is $branch"
-
-            echo "Log: Jump pull branch"
-
-        fi
-
-        read -p "Auto Push(Y, y, default: Y): " push
-
-        if [ -z "${push}" ];then
-            push='Y'
-        fi
-
-        if [[ $push = "Y" || $push = "y" ]];then
-
-            echo "Log: Pushing"
-
-            git push origin ${branch} || exit 1
-        fi
-
-        echo "------------ commit push shell end ------------"
-
-    else
-        echo "Error: Commit message start type must be one of [feat, fix, docs, style, chore, build, ci, perf, refactor, revert, test, temp, Feat, Fix, Docs, Style, Chore, Build, Ci, Perf, Refactor, Revert, Test, Temp]"
-        exit 1
-    fi
-
-else
-
-    echo "Please input commit msg"
-    exit 1
-
-fi
+###
+ # @Author: Rainy
+ # @Date: 2020-05-24 13:05:40
+ # @LastEditors: Rainy
+ # @LastEditTime: 2020-05-24 13:06:02
+### 
+
+#!/usr/bin/env bash
+
+echo "------------ commit push shell run ------------"
+
+read -p "Input your commit msg (*): " msg
+read -p "Amend commit(Y, y, default: N): " amend
+read -p "Need pull current branch(Y, y, default: N): " pull
+
+len=120
+curBranch=$(git branch | awk '/\*/ { print $2; }')
+
+# start reg
+msgRegLower='^\s*(feat|fix|docs|style|chore|build|ci|perf|refactor|revert|test|temp|update)\s*\:*\s*'
+msgRegUpper='^\s*(Feat|Fix|Docs|Style|Chore|Build|Ci|Perf|Refactor|Revert|Test|Temp|Update)\s*\:*\s*'
+
+# 另一种获取当前 branch_name 的方法
+# git symbolic-ref --short HEAD
+
+echo "Log: Cureren branch is ${curBranch}"
+
+if [[ $pull = "Y" || $pull = "y" ]];then
+
+    read -p "Need pull branch(default: current branch, eg: master): " branch
+
+fi
+
+if [ -n "$msg" ];then
+
+    echo "Log: Commit msg: $msg"
+
+    if [ ${#msg} -gt $len ];then
+        echo "Error: msg length must less than $len"
+        exit 1
+    fi
+
+    if [[ "$msg" =~ $msgRegLower || "$msg" =~ $msgRegUpper ]];then
+
+        git add .
+        
+        if [[ $amend = "Y" || $amend = "y" ]];then
+            echo "Log: Amending message commit"
+            git commit --amend -m "$msg" || exit 1
+        else
+            echo "Log: Commiting"
+            git commit -m "$msg" || exit 1
+        fi
+
+        if [[ $pull = "Y" || $pull = "y" ]];then
+
+            if [ -n "$branch" ];then
+
+            echo "Log: Pulling branch is $branch"
+
+            fi
+
+            branch=${curBranch}
+
+            echo "Log: Pulling ${branch} from remote"
+            git pull origin ${branch} || exit 1
+
+        else
+
+            branch=${curBranch}
+
+            echo "Log: Current branch is $branch"
+
+            echo "Log: Jump pull branch"
+
+        fi
+
+        read -p "Auto Push(Y, y, default: Y): " push
+
+        if [ -z "${push}" ];then
+            push='Y'
+        fi
+
+        if [[ $push = "Y" || $push = "y" ]];then
+
+            echo "Log: Pushing"
+
+            git push origin ${branch} || exit 1
+        fi
+
+        echo "------------ commit push shell end ------------"
+
+    else
+        echo "Error: Commit message start type must be one of [feat, fix, docs, style, chore, build, ci, perf, refactor, revert, test, temp, Feat, Fix, Docs, Style, Chore, Build, Ci, Perf, Refactor, Revert, Test, Temp]"
+        exit 1
+    fi
+
+else
+
+    echo "Please input commit msg"
+    exit 1
+
+fi

package/util/colors.js

@@ -1,16 +1,16 @@
-const colors = require('colors');
-
-colors.setTheme({
-	silly: 'rainbow',
-	input: 'grey',
-	verbose: 'cyan',
-	prompt: 'white',
-	info: 'green',
-	data: 'grey',
-	help: 'cyan',
-	warn: 'yellow',
-	debug: 'blue',
-	error: 'red',
-});
-
-module.exports = colors;
+const chalk = require('chalk');
+
+const colors = {
+	silly: text => chalk.hex('#ff69b4')(text),
+	input: text => chalk.grey(text),
+	verbose: text => chalk.cyan(text),
+	prompt: text => chalk.white(text),
+	info: text => chalk.green(text),
+	data: text => chalk.grey(text),
+	help: text => chalk.cyan(text),
+	warn: text => chalk.yellow(text),
+	debug: text => chalk.blue(text),
+	error: text => chalk.red(text),
+};
+
+module.exports = colors;

package/util/cookie.js

@@ -1,22 +1,22 @@
-module.exports = () => async (ctx, next) => {
-  if (global.userInfo.cookie) {
-    ctx.request.cookie = global.userInfo.cookie;
-  }
-
-  const cookieHeader = ctx.request.headers;
-
-  if (cookieHeader) {
-    global.userInfo.cookieList.forEach(cookie => {
-      const [key, value = ''] = cookie.split('=');
-
-      if (value) {
-        ctx.cookies.set(key, value.trim(), {
-        //   maxAge: 24 * 60 * 60 * 1000,
-          overwirte: true,
-        });
-      }
-    });
-  }
-
-  await next();
-};
+module.exports = () => async (ctx, next) => {
+	if (global.userInfo?.cookie) {
+		ctx.request.cookie = global.userInfo.cookie;
+	}
+
+	const cookieHeader = ctx.request.headers;
+
+	if (cookieHeader && Array.isArray(global.userInfo?.cookieList)) {
+		global.userInfo.cookieList.forEach(cookie => {
+			const [key, value = ''] = cookie.split('=');
+
+			if (value) {
+				ctx.cookies.set(key, value.trim(), {
+					//   maxAge: 24 * 60 * 60 * 1000,
+					overwrite: true,
+				});
+			}
+		});
+	}
+
+	await next();
+};

package/util/loginUtils.js

@@ -1,23 +1,28 @@
-const hash33 = (t) => {
-  for (var e = 0, n = 0, o = t.length; n < o; ++n)
-    e += (e << 5) + t.charCodeAt(n);
-  return 2147483647 & e
-};
-
-const getGtk = (p_skey) => {
-    var str = p_skey, hash = 5381;
-    for (var i = 0, len = str.length; i < len; ++i) {
-      hash += (hash << 5) + str.charCodeAt(i);
-    }
-    return hash & 0x7fffffff;
-};
-
-const getGuid = () => {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-      var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
-      return v.toString(16);
-  }).toUpperCase();
-};
-
-
-module.exports = { hash33, getGtk, getGuid };
+const hash33 = t => {
+	let e = 0;
+	for (let n = 0, o = t.length; n < o; ++n) {
+		e += (e << 5) + t.charCodeAt(n);
+	}
+	return 2147483647 & e;
+};
+
+const getGtk = p_skey => {
+	const str = p_skey;
+	let hash = 5381;
+	for (let i = 0, len = str.length; i < len; ++i) {
+		hash += (hash << 5) + str.charCodeAt(i);
+	}
+	return hash & 0x7fffffff;
+};
+
+const getGuid = () => {
+	return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'
+		.replace(/[xy]/g, function (c) {
+			const r = (Math.random() * 16) | 0;
+			const v = c === 'x' ? r : (r & 0x3) | 0x8;
+			return v.toString(16);
+		})
+		.toUpperCase();
+};
+
+module.exports = { hash33, getGtk, getGuid };

package/util/lyricParse.js

@@ -1,64 +1,64 @@
-// [01:27.96]
-const timeExp = /\[(\d{2,}):(\d{2})(?:\.(\d{2,3}))?]/g;
-
-const TAGREGMAP = {
-	title: 'ti',
-	artist: 'ar',
-	album: 'al',
-	offset: 'offset',
-	by: 'by',
-};
-
-class Lyric {
-	constructor(lyric) {
-		this.lyric = lyric;
-		this.tags = {};
-		this.lines = [];
-
-		this._init();
-	}
-
-	_init() {
-		this._initTag();
-
-		this._initLines();
-	}
-
-	_initTag() {
-		for (let tag in TAGREGMAP) {
-			const matches = this.lyric.match(new RegExp(`\\[${TAGREGMAP[tag]}:([^\\]]*)]`, 'i'));
-			this.tags[tag] = (matches && matches[1]) || '';
-		}
-	}
-
-	_initLines() {
-		const lines = this.lyric.split('\n');
-		for (let i = 0; i < lines.length; i++) {
-			const line = lines[i];
-			let result = timeExp.exec(line);
-			if (result) {
-				const txt = line.replace(timeExp, '').trim();
-				const time = result[1] * 60 * 1000 + result[2] * 1000 + (result[3] || 0) * 10;
-				if (txt) {
-					this.lines.push({
-						time,
-						txt,
-					});
-				}
-			}
-		}
-
-		this.lines.sort((a, b) => {
-			return a.time - b.time;
-		});
-	}
-}
-
-function lyricParse(lyricString) {
-	return new Lyric(lyricString);
-}
-
-module.exports = {
-	Lyric,
-	lyricParse,
-};
+// [01:27.96]
+const timeExp = /\[(\d{2,}):(\d{2})(?:\.(\d{2,3}))?]/g;
+
+const TAGREGMAP = {
+	title: 'ti',
+	artist: 'ar',
+	album: 'al',
+	offset: 'offset',
+	by: 'by',
+};
+
+class Lyric {
+	constructor(lyric) {
+		this.lyric = lyric;
+		this.tags = {};
+		this.lines = [];
+
+		this._init();
+	}
+
+	_init() {
+		this._initTag();
+
+		this._initLines();
+	}
+
+	_initTag() {
+		for (const tag in TAGREGMAP) {
+			const matches = this.lyric.match(new RegExp(`\\[${TAGREGMAP[tag]}:([^\\]]*)]`, 'i'));
+			this.tags[tag] = (matches && matches[1]) || '';
+		}
+	}
+
+	_initLines() {
+		const lines = this.lyric.split('\n');
+		for (let i = 0; i < lines.length; i++) {
+			const line = lines[i];
+			const result = timeExp.exec(line);
+			if (result) {
+				const txt = line.replace(timeExp, '').trim();
+				const time = result[1] * 60 * 1000 + result[2] * 1000 + (result[3] || 0) * 10;
+				if (txt) {
+					this.lines.push({
+						time,
+						txt,
+					});
+				}
+			}
+		}
+
+		this.lines.sort((a, b) => {
+			return a.time - b.time;
+		});
+	}
+}
+
+function lyricParse(lyricString) {
+	return new Lyric(lyricString);
+}
+
+module.exports = {
+	Lyric,
+	lyricParse,
+};

package/util/request.js

@@ -1,57 +1,57 @@
-const axios = require('axios');
-require('../util/colors');
-
-// `withCredentials` 表示跨域请求时是否需要使用凭证
-axios.defaults.withCredentials = true;
-axios.defaults.timeout = 10000;
-axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8;text/plain;';
-axios.defaults.responseType = 'json;text/plain;charset=utf-8;';
-
-const setHeaders = headers => {
-  return {
-    ...headers,
-    cookies: global.userInfo.cookie
-  };
-};
-
-let yURL = 'https://y.qq.com';
-let cURL = 'https://c.y.qq.com';
-// let uURL = 'https:/u.y.qq.com/cgi-bin/musicu.fcg';
-
-function request(url, method = 'GET', options = {}, isUUrl = 'c') {
-  let baseURL = '';
-  switch (isUUrl) {
-    case 'y':
-      baseURL = yURL + url;
-      break;
-    case 'u':
-      baseURL = url;
-      break;
-    case 'c':
-      baseURL = cURL + url;
-      break;
-    default:
-      baseURL = cURL + url;
-      break;
-  }
-
-  options = Object.assign(options, {
-    headers: setHeaders(options.headers || {}),
-  });
-
-  return axios[method](baseURL, options).then(
-    response => {
-      if (!response) {
-        throw Error('response is null');
-      }
-      console.log(`${url} request success`.info);
-      return response;
-    },
-    error => {
-      console.log(`${url} request error`.error);
-      throw error;
-    },
-  );
-}
-
-module.exports = request;
+const axios = require('axios');
+const colors = require('../util/colors');
+
+// `withCredentials` 表示跨域请求时是否需要使用凭证
+axios.defaults.withCredentials = true;
+axios.defaults.timeout = 10000;
+axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8;text/plain;';
+axios.defaults.responseType = 'json;text/plain;charset=utf-8;';
+
+const setHeaders = headers => {
+	return {
+		...headers,
+		cookies: global.userInfo.cookie,
+	};
+};
+
+const yURL = 'https://y.qq.com';
+const cURL = 'https://c.y.qq.com';
+// let uURL = 'https:/u.y.qq.com/cgi-bin/musicu.fcg';
+
+function request(url, method = 'GET', options = {}, isUUrl = 'c') {
+	let baseURL = '';
+	switch (isUUrl) {
+		case 'y':
+			baseURL = yURL + url;
+			break;
+		case 'u':
+			baseURL = url;
+			break;
+		case 'c':
+			baseURL = cURL + url;
+			break;
+		default:
+			baseURL = cURL + url;
+			break;
+	}
+
+	options = Object.assign(options, {
+		headers: setHeaders(options.headers || {}),
+	});
+
+	return axios[method](baseURL, options).then(
+		response => {
+			if (!response) {
+				throw Error('response is null');
+			}
+			console.log(colors.info(`${url} request success`));
+			return response;
+		},
+		error => {
+			console.log(colors.error(`${url} request error`));
+			throw error;
+		},
+	);
+}
+
+module.exports = request;