Fix douyutv

.jpmignore

@@ -15,6 +15,10 @@ node_modules/
 !node_modules/istanbul-jpm/
 !node_modules/notification-box/
 !node_modules/preferences-utils/
+!node_modules/md5/
+!node_modules/crypt/
+!node_modules/charenc/
+!node_modules/is-buffer/
 node_modules/istanbul-jpm/node_modules/
 
 *CHANGELOG*
@@ -32,4 +36,4 @@ python-lib/
 build/
 coverage/reports/
 transpiled/
-bower_components/
+bower_components/r

Gruntfile.js

@@ -7,6 +7,9 @@ module.exports = function(grunt) {
     var dependencies = Object.keys(pkg.dependencies).map(function(d) {
         return d + "/**/*";
     });
+    dependencies.push("is-buffer/**/*");
+    dependencies.push("charenc/**/*");
+    dependencies.push("crypt/**/*");
 
     grunt.initConfig({
         pkg: pkg,

lib/providers/douyutv.js

@@ -10,9 +10,10 @@ const { Class: newClass } = require("sdk/core/heritage");
 const { emit } = require("sdk/event/core");
 const { Channel } = require('../channel/core');
 const { GenericProvider } = require("./generic-provider");
+const md5 = require('md5');
 
 const type = "douyutv",
-      baseURL = "http://www.douyutv.com/api/client/",
+      baseURL = "http://www.douyutv.com/api/v1/",
       roomURL = "http://www.douyutv.com";
 
 const getChannelFromJSON = (json) => {
@@ -31,13 +32,19 @@ const getChannelFromJSON = (json) => {
     return chan;
 };
 
+const signAPI = (endpoint, id) => {
+    const argument = endpoint + id + "?aid=android&client_sys=android&time=" + Date.now();
+    const sign = md5(argument + '1231');
+    return argument + "&auth=" + sign;
+};
+
 const Douyutv = newClass(
 /** @lends module:providers/douyutv~Douyutv */
 {
     extends: GenericProvider,
     authURL: ["http://www.douyutv.com"],
     getChannelDetails: function(username) {
-        return this._qs.queueRequest(baseURL + "room/" + username).then((data) => {
+        return this._qs.queueRequest(baseURL + signAPI("room/", username)).then((data) => {
             if(data.json && data.json.error === 0) {
                 return getChannelFromJSON(data.json.data);
             }
@@ -47,7 +54,7 @@ const Douyutv = newClass(
         });
     },
     updateRequest: function(channels) {
-        const urls = channels.map((ch) => baseURL + "room/" + ch.login);
+        const urls = channels.map((ch) => baseURL + signAPI("room/", ch.login));
         this._qs.queueUpdateRequest(urls, this._qs.HIGH_PRIORITY, (data) => {
             if(data.json && data.json.error === 0) {
                 emit(this, "updatedchannels", getChannelFromJSON(data.json.data));

package.json

@@ -263,6 +263,7 @@
   },
   "dependencies": {
     "jetpack-homepanel": "^1.0.1",
+    "md5": "^2.1.0",
     "notification-box": "^0.1.1",
     "preferences-utils": "0.0.1"
   },

test/providers/mock-qs.js

@@ -32,6 +32,10 @@ const getRequest = (type, url)  => {
 
         url = u.join("?");
     }
+    else if(type == "douyutv") {
+        url = url.split("?")[0];
+    }
+
     console.log("Getting", url);
     if(type in mockAPIEnpoints && url in mockAPIEnpoints[type]) {
         return {

test/providers/mockAPI.json

@@ -369,7 +369,7 @@
         }
     },
     "douyutv": {
-        "http://www.douyutv.com/api/client/room/test": {
+        "http://www.douyutv.com/api/v1/room/test": {
             "error": 0,
             "data": {
                 "room_id": "test",
@@ -383,7 +383,7 @@
                 "url": "/test"
             }
         },
-        "http://www.douyutv.com/api/client/room/live": {
+        "http://www.douyutv.com/api/v1/room/live": {
             "error": 0,
             "data": {
                 "room_id": "live",

test/test-providers-twitch.js

@@ -4,6 +4,7 @@
  * @license MPL-2.0
  * @todo test playlist and hosting for all three methods
  * @todo test hosting preferred over playlist
+ * @todo test hosting & playlist testchannels with the things disabled
  */
 "use strict";