Merge pull request #211 from trazyn/dev

Fix high cpu usage

.eslintignore

@@ -1,6 +1,7 @@
 
-dist/*
 __tests__/*
+dist/*
+node_modules/*
 src/assets/*
 server/api/*
 NeteaseCloudMusicApi/*

.eslintrc.json

@@ -1,11 +1,11 @@
 {
     "parserOptions": {
-        "ecmaVersion": 6,
-            "sourceType": "module",
-            "ecmaFeatures": {
-                "impliedStrict": true,
-                "jsx": true
-            }
+        "ecmaVersion": 8,
+        "sourceType": "module",
+        "ecmaFeatures": {
+            "impliedStrict": true,
+            "jsx": true
+        }
     },
     "env": {
         "es6": true,
@@ -16,7 +16,7 @@
     "rules": {
         "semi": [2, "always"],
         "new-cap": [0],
-        "prefer-promise-reject-errors": [0],
+        "prefer-promise-reject-errors": [1],
         "indent": [2, 4, { "SwitchCase": 1 }],
         "comma-dangle": [2, "only-multiline"],
         "space-before-function-paren": [2, "never"],

.gitignore

@@ -6,7 +6,7 @@
 #
 dist/
 release/
-package-lock.json
+*-lock.json
 
 # Xcode
 #

.travis.yml

@@ -3,8 +3,8 @@ sudo: false
 language: node_js
 
 node_js:
+  - 9
   - 8
   - 7
-  - 6
 
 script: npm run lint && npm run build

package.json

@@ -98,7 +98,7 @@
     "copy-webpack-plugin": "^4.0.1",
     "cross-env": "^5.2.0",
     "css-loader": "^1.0.0",
-    "electron": "^1.8.7",
+    "electron": "^2.0.4",
     "electron-builder": "^20.19.2",
     "eslint": "^5.0.1",
     "eslint-config-standard": "^11.0.0",

server/search/Baidu.js

@@ -22,7 +22,7 @@ export default async(request, keyword, artists) => {
 
         if (!song) {
             error(chalk.black.bgRed('🚧  Nothing.'));
-            return Promise.reject();
+            return Promise.reject(Error(404));
         }
 
         response = await request({
@@ -39,7 +39,7 @@ export default async(request, keyword, artists) => {
             || response.data.songList.length === 0
         ) {
             error(chalk.black.bgRed('🚧  Nothing.'));
-            return Promise.reject();
+            return Promise.reject(Error(404));
         }
 
         song = response.data.songList[0];
@@ -48,7 +48,7 @@ export default async(request, keyword, artists) => {
         song.bitRate = song.rate * 1000;
 
         if (!song.src) {
-            return Promise.reject();
+            return Promise.reject(Error(404));
         } else {
             debug(chalk.black.bgGreen('🚚  Result >>>'));
             debug(response.data.songList[0]);
@@ -57,7 +57,7 @@ export default async(request, keyword, artists) => {
     } catch (ex) {
         // Anti-warnning
         error('Failed to get song: %O', ex);
-        return Promise.reject();
+        return Promise.reject(ex);
     }
 
     return song;

server/search/Kugou.js

@@ -46,7 +46,7 @@ export default async(request, keyword, artists) => {
         if (response.status !== 1
             || data.info.length === 0) {
             error(chalk.black.bgRed('🚧  Nothing.'));
-            return Promise.reject();
+            return Promise.reject(Error(404));
         }
 
         for (let e of data.info) {
@@ -71,9 +71,9 @@ export default async(request, keyword, artists) => {
         }
     } catch (ex) {
         error('Failed to get song: %O', ex);
-        return Promise.reject();
+        return Promise.reject(ex);
     }
 
-    error(chalk.black.bgRed('🈚  Not Matched.'));
-    return Promise.reject();
+    error(chalk.black.bgRed('🈚  Not Matched'));
+    return Promise.reject(Error(405));
 };

server/search/Kuwo.js

@@ -41,7 +41,7 @@ export default async(request, keyword, artists) => {
 
         if (!payload) {
             error(chalk.black.bgRed('🚧  Nothing.'));
-            return Promise.reject();
+            return Promise.reject(Error(404));
         }
 
         response = await request({
@@ -56,7 +56,7 @@ export default async(request, keyword, artists) => {
 
         if (!response) {
             error(chalk.black.bgRed('🚧  Nothing.'));
-            return Promise.reject();
+            return Promise.reject(Error(404));
         }
 
         var song = {
@@ -70,7 +70,7 @@ export default async(request, keyword, artists) => {
     } catch (ex) {
         // Anti-warnning
         error('Failed to get song: %O', ex);
-        return Promise.reject();
+        return Promise.reject(ex);
     }
 
     return song;

server/search/MiGu.js

@@ -21,7 +21,7 @@ export default async(request, keyword, artists) => {
 
         if (response.success !== true || response.musics.length === 0) {
             error(chalk.black.bgRed('🚧  Nothing.'));
-            return Promise.reject();
+            return Promise.reject(Error(404));
         }
 
         for (let e of response.musics) {
@@ -39,9 +39,9 @@ export default async(request, keyword, artists) => {
         }
     } catch (ex) {
         error('Failed to get song: %O', ex);
-        return Promise.reject();
+        return Promise.reject(ex);
     }
 
     error(chalk.black.bgRed('🈚  Not Matched.'));
-    return Promise.reject();
+    return Promise.reject(Error(405));
 };

server/search/QQ.js

@@ -132,7 +132,7 @@ export default async(request, keyword, artists) => {
         if (response.code !== 0
             || data.song.list.length === 0) {
             error(chalk.black.bgRed('🚧  Nothing.'));
-            return Promise.reject();
+            return Promise.reject(Error(404));
         }
 
         for (let e of data.song.list) {
@@ -147,7 +147,7 @@ export default async(request, keyword, artists) => {
 
             if (!song.src) {
                 error(chalk.black.bgRed('🚧  Nothing.'));
-                return Promise.reject();
+                return Promise.reject(Error(404));
             }
 
             debug(chalk.black.bgGreen('🚚  Result >>>'));
@@ -158,9 +158,9 @@ export default async(request, keyword, artists) => {
         }
     } catch (ex) {
         error('Failed to get song: %O', ex);
-        return Promise.reject();
+        return Promise.reject(ex);
     }
 
     error(chalk.black.bgRed('🈚  Not Matched.'));
-    return Promise.reject();
+    return Promise.reject(Error(405));
 };

server/search/Xiami.js

@@ -33,7 +33,7 @@ export default async(request, keyword, artists) => {
         if (response.state !== 0
             || data.songs.length === 0) {
             error(chalk.black.bgRed('🚧  Nothing.'));
-            return Promise.reject();
+            return Promise.reject(Error(404));
         }
 
         for (let e of data.songs) {
@@ -50,7 +50,7 @@ export default async(request, keyword, artists) => {
             song.src = e.listen_file;
 
             if (!song.src) {
-                return Promise.reject();
+                return Promise.reject(Error(404));
             } else {
                 debug(chalk.black.bgGreen('🚚  Result >>>'));
                 debug(e);
@@ -61,9 +61,9 @@ export default async(request, keyword, artists) => {
         }
     } catch (ex) {
         error('Failed to get song: %O', ex);
-        return Promise.reject();
+        return Promise.reject(ex);
     }
 
     error(chalk.black.bgRed('🈚  Not Matched.'));
-    return Promise.reject();
+    return Promise.reject(Error(405));
 };

src/app.js

@@ -15,7 +15,7 @@ import stores from './js/stores';
 class App extends Component {
     componentDidMount() {
         var { preferences, controller, fm, me, menu, playing } = stores;
-        var navigator = this.refs.navigator;
+        var navigator = this.navigator;
         var isFMPlaying = () => controller.playlist.id === fm.playlist.id;
 
         function togglePreferences() {
@@ -293,7 +293,11 @@ class App extends Component {
     render() {
         return (
             <Provider {...stores}>
-                <HashRouter ref="navigator">
+                <HashRouter
+                    ref={
+                        ele => (this.navigator = ele)
+                    }
+                >
                     {getRoutes()}
                 </HashRouter>
             </Provider>