Switch to Koa, more es6

lib/services/deezer/index.js

@@ -1,109 +1,110 @@
-"use strict";
-var parse = require('url').parse;
-var Promise = require('bluebird');
-var request = require('superagent');
-require('superagent-bluebird-promise');
+import {parse} from 'url';
+import request from 'superagent';
+import 'superagent-bluebird-promise';
 
-module.exports.id = "deezer";
+module.exports.id = 'deezer';
 
-var apiRoot = "https://api.deezer.com";
+const apiRoot = 'https://api.deezer.com';
 
 module.exports.match = require('./url').match;
 
 module.exports.parseUrl = function(url) {
-  var matches = parse(url).path.match(/\/(album|track)[\/]+([^\/]+)/);
+  let matches = parse(url).path.match(/\/(album|track)[\/]+([^\/]+)/);
 
   if (matches && matches[2]) {
     return module.exports.lookupId(matches[2], matches[1]);
   } else {
     throw new Error();
   }
-}
-
-module.exports.lookupId = function(id, type) {
-  var path = "/" + type + "/" + id;
-
-  return request.get(apiRoot + path).promise().then(function(res) {
-    var result = res.body;
-    if (res.body.error) {
-      var error = new Error("Not Found");
-      error.status = 404;
-      throw error;
-    }
-    var cover = result.cover || result.album.cover;
-    return request.get(cover).redirects(0).promise().then(function(res) {
-      var artwork = {
-        small: res.headers.location.replace("120x120", "200x200"),
-        large: res.headers.location.replace("120x120", "800x800")
-      };
-      if (type == "album") {
-        return {
-          service: "deezer",
-          type: type,
-          id: result.id,
-          name: result.title,
-          streamUrl: result.link,
-          purchaseUrl: null,
-          artwork: artwork,
-          artist: {
-            name: result.artist.name
-          },
-        };
-      } else if (type == "track") {
-        return {
-          service: "deezer",
-          type: type,
-          id: result.id,
-          name: result.title,
-          streamUrl: result.album.link,
-          purchaseUrl: null,
-          artwork: artwork,
-          artist: {
-            name: result.artist.name
-          },
-          album: {
-            name: result.album.title
-          }
-        };
-      } else {
-        throw new Error();
-      }
-    });
-  });
 };
 
-module.exports.search = function(data) {
-  var cleanParam = function(str) {
-    return str.replace(/[\:\?\&]+/, "");
-  }
-  var query, album;
-  var type = data.type;
+module.exports.lookupId = function* (id, type) {
+  let path = '/' + type + '/' + id;
 
-  if (type == "album") {
-    query = cleanParam(data.artist.name) + " " + cleanParam(data.name);
+  let {body} = yield request.get(apiRoot + path).promise();
+  if (!body || body.error) {
+    let error = new Error('Not Found');
+    error.status = 404;
+    return Promise.reject(error);
+  }
+  let item = body;
+  let coverUrl = item.cover || item.album.cover;
+  let cover = 'test';
+  // nasty hacks for superagent-bluebird-promise
+  try {
+    cover = yield request.get(coverUrl).redirects(0);
+  } catch(err) {
+    cover = err.message.response.res;
+  }
+  let artwork = {
+    small: cover.headers.location.replace('120x120', '200x200'),
+    large: cover.headers.location.replace('120x120', '800x800')
+  };
+  if (type === 'album') {
+    return Promise.resolve({
+      service: 'deezer',
+      type: type,
+      id: item.id,
+      name: item.title,
+      streamUrl: item.link,
+      purchaseUrl: null,
+      artwork: artwork,
+      artist: {
+        name: item.artist.name
+      }
+    });
+  } else if (type === 'track') {
+    return Promise.resolve({
+      service: 'deezer',
+      type: type,
+      id: item.id,
+      name: item.title,
+      streamUrl: item.album.link,
+      purchaseUrl: null,
+      artwork: artwork,
+      artist: {
+        name: item.artist.name
+      },
+      album: {
+        name: item.album.title
+      }
+    });
+  } else {
+    return Promise.reject(new Error());
+  }
+};
+
+module.exports.search = function* (data) {
+  let cleanParam = function(str) {
+    return str.replace(/[\:\?\&]+/, '');
+  };
+  let query, album;
+  let {type} = data;
+
+  if (type === 'album') {
+    query = cleanParam(data.artist.name) + ' ' + cleanParam(data.name);
     album = data.name;
-  } else if (type == "track") {
-    query = cleanParam(data.artist.name) + " " + cleanParam(data.album.name) + " " + cleanParam(data.name);
+  } else if (type === 'track') {
+    query = cleanParam(data.artist.name) + ' ' + cleanParam(data.album.name) + ' ' + cleanParam(data.name);
     album = data.album.name;
   }
 
-  var path = "/search/" + type + "?q=" + encodeURIComponent(query);
-  return request.get(apiRoot + path).promise().then(function(res) {
-    if (!res.body.data[0]) {
-      var matches = album.match(/^[^\(\[]+/);
-      if (matches && matches[0] && matches[0] != album) {
-        var cleanedData = JSON.parse(JSON.stringify(data));
-        if (type == "album") {
-          cleanedData.name = matches[0].trim();
-        } else if (type == "track") {
-          cleanedData.album.name = matches[0].trim();
-        }
-        return module.exports.search(cleanedData);
-      } else {
-        return {service: "deezer"};
+  var path = '/search/' + type + '?q=' + encodeURIComponent(query);
+  let response = yield request.get(apiRoot + path);
+  if (response.body.data[0]) {
+    return yield module.exports.lookupId(response.body.data[0].id, type);
+  } else {
+    var matches = album.match(/^[^\(\[]+/);
+    if (matches && matches[0] && matches[0] !== album) {
+      var cleanedData = JSON.parse(JSON.stringify(data));
+      if (type === 'album') {
+        cleanedData.name = matches[0].trim();
+      } else if (type === 'track') {
+        cleanedData.album.name = matches[0].trim();
       }
+      return yield module.exports.search(cleanedData);
     } else {
-      return module.exports.lookupId(res.body.data[0].id, type);
+      return Promise.resolve({service: 'deezer'});
     }
-  });
+  }
 };