[ALL] Much better error handling

Author: Dario Segura

server/lyrics/Lyrics.js

@@ -17,6 +17,10 @@ function findLyrics(song, artist, duration) {
  }
  // cascade if needed
  resolve(lyrics);
+ })
+ .catch(reason => {
+ log(reason);
+ return null;
  });
  // Xiami.search(song, artist, duration);
  // NetEase.search(song, artist, duration);

src/frontend/header/SearchBar.js

@@ -63,8 +63,10 @@ export class SearchBar {
  }
  } else if (value()) {
  Service.activeService().searchHints(value()).then(result => {
- matches(result.terms);
- m.redraw();
+ if (result) {
+ matches(result.terms);
+ m.redraw();
+ }
  });
  } else {
  matches([]);

src/frontend/routes/Home.js

@@ -28,6 +28,10 @@ export class Home extends Layout {
  ]),
  m('.search-loading-text', 'Loading...'),
  ]);
+ } else if (this.mContent.hasOwnProperty('error')) {
+ return m('.search-full-centered', [
+ m('.search-loading-text', this.mContent.error),
+ ]);
  }
 
  return this.mContent.map(row => {
@@ -57,7 +61,13 @@ export class Home extends Layout {
  _loadContent() {
  if (!this.mContent && Service.activeService()) {
  Service.activeService().getHomeContent().then(content => {
- this.mContent = content;
+ if (content) {
+ this.mContent = content;
+ } else {
+ this.mContent = {
+ error: 'An error occurred loading the home content, please try again later.',
+ };
+ }
  m.redraw();
  });
  }

src/frontend/routes/NowPlaying.js

@@ -3,8 +3,7 @@ import {Layout} from '../Layout';
 import {List} from 'polythene-mithril';
 import {SongItem} from '../components/SongItem';
 import {MediaManager} from '../../service/MediaManager';
-import {Buttons, GeneralEvents, PlaybackEvents} from '../Events';
-import {EventCenter} from '../../core/EventCenter';
+import {Buttons} from '../Events';
 
 export class NowPlaying extends Layout {
  constructor(/* vnode */) {

src/frontend/routes/Playlist.js

@@ -79,9 +79,7 @@ export class Playlist extends Layout {
  const service = Service.activeService(serviceName ? serviceName : null);
  if (service && playlistID) {
  this.mPlaylist = null;
- let p;
- p = service.getPlaylistInfo(playlistID);
- p.then(result => {
+ service.getPlaylistInfo(playlistID).then(result => {
  if (result) {
  this.mPlaylist = result;
  } else {

src/frontend/routes/Search.js

@@ -39,6 +39,10 @@ export class Search extends Layout {
  ]);
  }
 
+ if (this.mSearchResults.hasOwnProperty('error')) {
+ return m('.search-result-header', this.mSearchResults.error);
+ }
+
  let hasContent = false;
  Object.keys(this.mSearchResults).forEach(key => {
  hasContent = this.mSearchResults[key] || hasContent;
@@ -66,7 +70,13 @@ export class Search extends Layout {
  const service = Service.activeService();
  this.mSearchResults = null;
  service.search(searchTerm, 21).then(result => {
- this.mSearchResults = result;
+ if (result) {
+ this.mSearchResults = result;
+ } else {
+ this.mSearchResults = {
+ error: 'An error occurred, please try again later',
+ };
+ }
  m.redraw();
  });
  }

src/frontend/routes/Splash.js

@@ -74,6 +74,9 @@ export class Splash {
  document.addEventListener('musickitloaded', () => {
  AppleService.instance().init('devtoken.jwt', 'Jukebox by Julyee', '1.0.0').then(() => {
  m.redraw();
+ }).catch(reason => {
+ console.error(reason); // eslint-disable-line
+ window.MusicKit = null;
  });
  });
  }
@@ -273,6 +276,9 @@ export class Splash {
  } else {
  Dialog.hide();
  }
+ }).catch(reason => {
+ console.error(reason); // eslint-disable-line
+ Dialog.hide();
  });
 
  Dialog.show(loadingDialog({
@@ -285,7 +291,7 @@ export class Splash {
  } else {
  Dialog.show(WarningDialog.get(
  'Error',
- 'Could not connect to the specified server.',
+ 'Could not connect to Apple Music.',
  'Got it'
  ));
  }

src/frontend/utils/QRScannerWorker.js

@@ -39,8 +39,6 @@ const source =
  alignpat + '\n' +
  databr;
 
-
-
 const blob = new Blob([source], {type: 'application/javascript'});
 
 export const QRWorkerURL = URL.createObjectURL(blob);

src/index.js

@@ -9,5 +9,8 @@ async function main() {
 
 document.addEventListener('DOMContentLoaded', async () => {
  console.log(webRTCAdapter); // eslint-disable-line
- await main();
+ await main().catch(reason => {
+ console.error('[JUKEBOX] Unhandled ERROR: %o', reason); // eslint-disable-line
+ return null;
+ });
 }, true);

src/service/MusicQueue.js

@@ -1,5 +1,4 @@
 import IBindable from '../core/IBindable';
-import {EventCenter} from '../core/EventCenter';
 
 export class MusicQueue extends IBindable {
  constructor() {
@@ -67,6 +66,10 @@ export class MusicQueue extends IBindable {
  .then(lyrics => {
  this.mLyricsCache[key] = lyrics;
  return lyrics;
+ }).catch(reason => {
+ console.error(reason); // eslint-disable-line
+ delete this.mLyricsCache[key];
+ return null;
  });
  }