efront 3.33.2 → 3.34.0

package/apps/kugou/index.html

@@ -10,7 +10,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link rel="Shortcut Icon" href="/favicon.ico" type="image/x-icon" />
     <meta name="viewport" content="initial-scale=1,maximum-scale=1,width=device-width" />
-    <title>酷狗尊享版</title>
+    <title>酷狗酷你尊享版</title><!-- 这个名字怎么听怎么像骂狗的，你和狗怎么可以放在相同的位置，真是太抬举你了 -->
     <script deleteoncompile efrontloader>
         // 若要在开发环境使用内置组件，请保留此script标签中的代码，在编译发布时，这里的代码会自动删除
     </script>

package/apps/kugou/main.js

@@ -1,4 +1,8 @@
 data.setConfig(api);
+data.getApi("kuwo-token").then(function (api) {
+    var token = cookie.getCookies(api.base);
+    if (!token) cross("get", api.base);
+});
 zimoli.switch("", null, "/home");
 css("body", "background-color:#323336;");
 zimoli();

package/apps/kugou/search/search.html

@@ -1,7 +1,6 @@
 <titlebar>
     <back></back>
-    <input placeholder="请输入关键字搜索" ng-model=keyword
-        ng-keyup="event.which===13?confirm():search(this.value)" />
+    <input placeholder="请输入关键字搜索" ng-model=keyword ng-keyup="event.which===13?confirm():search(this.value)" />
     <icon class="loading" ng-if="result?.loading"></icon>
     <btn ng-click="keyword='';search()">清空</btn>
 </titlebar>
@@ -13,8 +12,8 @@
         <btn ng-click="search(s,0)"><span ng-bind="s"></span></btn>
     </padding>
 </div>
-<list ng-if="keyword" ng-src="s in result">
+<list -else ng-src="s in result" min-width=260 >
     <padding>
-        <song _mark=keyword ng-click="play(s.hash)" ng-src=s></song>
+        <song _mark=keyword @play="play(event.value)" ng-src=s></song>
     </padding>
 </list>

package/apps/kugou/search/search.js

@@ -19,8 +19,9 @@ function main(params, from) {
         searchHistory,
         player: kugou$player,
         padding,
-        play(hash) {
-            this.player.play(hash);
+        list: gallery,
+        play(info) {
+            this.player.play(info);
             var words = searchHistory.slice(0);
             var { keyword } = this;
             for (var cx = words.length - 1; cx >= 0; cx--) {
@@ -30,10 +31,41 @@ function main(params, from) {
             words = words.slice(0, 20);
             data.setInstance("searchHistory", words, true);
         },
-        search(keyword = this.keyword, timeout = 600) {
-            if ($scope.keyword !== keyword) $scope.keyword = keyword;
-            $scope.result = data.lazyInstance('search', { keyword }, timeout);
+        resultMap: null,
+        addResult(info) {
+            var resultMap = this.resultMap;
+            var singerName = sortname(String(info.singername || '').split(/[\&\,，、]/)).join('、');
+            var songName = info.songname;
+            var id = `${singerName}:${info.songname}`;
+            if (!resultMap[id]) resultMap[id] = Object.assign([], { singer: singerName, song: songName });
+            resultMap[id].push(info);
+        },
+        async requestSearch(type, id, params, mp, timeout) {
+            var res = await data.from(id, params, timeout);
+            if (mp !== this.resultMap) return;
+            res.forEach(a => a.type = type);
+            res.forEach(this.addResult, this);
+            this.result = Object.keys(this.resultMap).map(k => this.resultMap[k]);
+            for (var r of this.result) r.sort((a, b) => a.priced - b.priced);
+            return res;
+        },
+        searched: null,
+        async search(keyword = this.keyword, timeout = 600) {
+            if (keyword === this.searched) return;
+            this.keyword = keyword;
+            this.searched = keyword;
+            this.resultMap = Object.create(null);
+            this.result = [];
+            var s1 = this.requestSearch("kugo", 'search', { keyword }, this.resultMap, timeout);
+            var s2 = this.requestSearch("kuwo", "search-kuwo", { key: keyword }, this.resultMap, timeout);
             state({ keyword });
+            s1.then(function (s1) {
+                s1.forEach(a => {
+                    a.priced = a.privilege === 10 && (a.price_sq > 0);
+                });
+            })
+            await Promise.all([s1, s2]);
+
         },
         confirm() {
             this.search(void 0, 0);

package/apps/kugou/search/search.less

@@ -87,4 +87,7 @@
         background: #5769;
         padding: 0 16px;
     }
+}
+list padding{
+    display: block;
 }

package/coms/basic/cookie.js

@@ -1,4 +1,3 @@
-var cookiesMap = {};
 var parseCookieFromText = function (cookie) {
     var pairs = cookie.split(/;\s*/);
     var info = {};
@@ -22,7 +21,12 @@ var parseCookieFromText = function (cookie) {
     return [pair, info];
 };
 
-function addCookie(cookie_text, originDomain = "") {
+class Cookie {
+    cookiesMap = {};
+}
+var CookieProto = Cookie.prototype;
+CookieProto.addCookie = function addCookie(cookie_text, originDomain = "") {
+    var { cookiesMap } = this;
     originDomain = getDomainPath(originDomain);
     if (!cookie_text) return;
     if (cookie_text instanceof Array) cookie_text = cookie_text.join(",");
@@ -57,7 +61,8 @@ function addCookie(cookie_text, originDomain = "") {
     }
 }
 
-function getCookies(domainPath) {
+CookieProto.getCookies = function getCookies(domainPath) {
+    var { cookiesMap } = this;
     domainPath = getDomainPath(domainPath);
     var cookieObject = {};
     var splited = domainPath.split("/");
@@ -88,7 +93,8 @@ function getCookies(domainPath) {
     return serialize(cookieObject, ";");
 }
 
-function delCookies(domainPath) {
+CookieProto.delCookies = function delCookies(domainPath) {
+    var { cookiesMap } = this;
     domainPath = getDomainPath(domainPath);
     var splited = domainPath.split("/");
     var domain = splited[0];
@@ -100,7 +106,8 @@ function getDomainPath(url) {
     return host;
 }
 
-function linkCookie(from, to) {
+CookieProto.linkCookie = function linkCookie(from, to) {
+    var { cookiesMap } = this;
     from = getDomainPath(from).replace(/\/$/, '');
     to = getDomainPath(to).replace(/\/$/, '');
     if (cookiesMap[from]) {
@@ -109,7 +116,8 @@ function linkCookie(from, to) {
     cookiesMap[to] = cookiesMap[from] = extend({}, cookiesMap[to], cookiesMap[from]);
     return to;
 }
-function copyCookie(from, to) {
+CookieProto.copyCookie = function copyCookie(from, to) {
+    var { cookiesMap } = this;
     from = getDomainPath(from).replace(/\/$,'/, '');
     to = getDomainPath(to).replace(/\/$/, '');
     if (from in cookiesMap) {
@@ -119,12 +127,6 @@ function copyCookie(from, to) {
         delete cookiesMap[to];
     }
 }
-
-return {
-    cookiesMap,
-    addCookie,
-    getCookies,
-    delCookies,
-    linkCookie,
-    copyCookie
-}
+var defaultCookie = new Cookie;
+defaultCookie.new = () => new Cookie;
+return defaultCookie;

package/coms/basic/cross_.js

@@ -1,4 +1,3 @@
-var { getCookies, addCookie, delCookies } = cookie;
 var { File } = this;
 function hasFile(o) {
     if (!File) return false;
@@ -43,14 +42,7 @@ var getCrossUrl = function (domain, headers, encrypt) {
         if (!encrypt) return domain;
         domain = domain.replace(domainReg, "/$3$4");
     }
-    var originDomain = getDomainPath(domain);
-    var _cookies = getCookies(originDomain);
-    var _headers = {};
-    if (_cookies) {
-        _headers.Cookie = _cookies;
-    }
-    extend(_headers, headers);
-    _headers = serialize(_headers);
+    var _headers = serialize(headers);
     if (_headers) _headers = "," + _headers;
     var b = encrypt ? "!" : `*`;
     var ishttps = /^(https\:|s\/\/)/i.test(domain);
@@ -137,18 +129,6 @@ function createResponse(response, status = 0) {
 function cross_(jsonp, digest = noop, method, url, headers) {
     var originDomain = getDomainPath(url);
     if (!originDomain) throw new Error("路径格式错误！");
-    var _cookies = getCookies(originDomain);
-    var _headers = {};
-    if (_cookies) {
-        _headers.Cookie = _cookies;
-    }
-    extend(_headers, headers);
-    if (/^[mc]/i.test(method)) {
-        _headers["User-Agent"] = /^m/i.test(method)
-            ? "efront/3.25 (iPhone) Safari/602.1"
-            : "efront/3.25 (Windows) Chrome/77.0.3865.90";
-        method = method.slice(1);
-    }
     var loaded, errored;
     var onload = function (data) {
         if (!~requests.indexOf(_xhr)) return;
@@ -232,7 +212,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                             onerror({ status: xhr.status, response: "Cookie解析异常!", toString: toResponse });
                             return;
                         }
-                        addCookie(cookie, originDomain);
+                        cookie_.addCookie(cookie, originDomain);
                     }
 
                 }
@@ -385,6 +365,32 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     }
     var setRequestHeader = xhr.setRequestHeader;
     var realHeaders = Object.create(null);
+    var cookie_ = this.hostCookie(xhr);
+    var _cookies = cookie_.getCookies(originDomain);
+    var _headers = {};
+    if (_cookies) {
+        _headers.Cookie = _cookies;
+    }
+    var cookobj = null;
+    for (var k in headers) {
+        if (/^\$/.test(headers[k])) {
+            var k2 = headers[k].slice(1);
+            if (!cookobj) cookobj = _cookies ? parseKV(_cookies, ';') : {};
+            if (k2 in cookobj) {
+                _headers[k] = cookobj[k2];
+            }
+        }
+        else {
+            _headers[k] = headers[k];
+        }
+    }
+    if (/^[mc]/i.test(method)) {
+        _headers["User-Agent"] = /^m/i.test(method)
+            ? "efront/3.25 (iPhone) Safari/602.1"
+            : "efront/3.25 (Windows) Chrome/77.0.3865.90";
+        method = method.slice(1);
+    }
+
     xhr.setRequestHeader = function (key, value) {
         realHeaders[key] = value;
     };
@@ -412,12 +418,12 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     };
     xhr.abort = XMLHttpRequest_abort;
     xhr.delCookies = function () {
-        delCookies(originDomain);
+        cookie_.delCookies(originDomain);
         xhr.nocookie = true;
         return xhr;
     };
     xhr.getCookies = function () {
-        return getCookies(originDomain);
+        return cookie_.getCookies(originDomain);
     };
     requests.push(xhr);
     var _xhr = xhr;
@@ -471,6 +477,7 @@ var bind = cross_.bind;
 cross_.bind = function () {
     var cross_ = bind.apply(this, arguments);
     arguments[0].getCode = getCode.bind(cross_);
+    arguments[0].hostCookie = function () { return cross_.hostCookie.apply(this, arguments) };
     extend(cross_, {
         requests,
         abortAll() {
@@ -478,8 +485,6 @@ cross_.bind = function () {
         },
         setHost,
         addReform,
-        getCookies,
-        addCookie,
         addDirect,
         getCrossUrl
     });

package/coms/kugou/api.js

@@ -1,6 +1,6 @@
 ({
     "https://m.kugou.com/": {
-        "song-info": "get                                 app/i/getSongInfo.php?cmd=playInfo&from=mkugou&hash",
+        "song-info;hash": "get                                 app/i/getSongInfo.php?cmd=playInfo&from=mkugou",
         "slider-src": "get:[].mod-slider>.swipe-wrap>div  .#src=img!src&href=a!href",
         "songs-list": "get:[].panel-songslist%20li          .#hash=!id&.panel-songs-item-name>span!innerText",
         "songs-list": "get:[].m_cm_item1warp:nth-child(2)>div .#=a!href\\song-mix&a:nth-child(2)>p:first-child!innerText&singer=a:nth-child(2)>p:nth-child(2)!innerText&imgurl=img!_src",
@@ -20,5 +20,19 @@
     },
     "http://mobilecdn.kugou.com/": {
         "search?keyword": "get:data.info                            api/v3/search/song?format=json&page=1&pagesize=30&showtype=1"
+    },
+    "http://www.kuwo.cn/": {
+        "kuwo-token"/*主要用于初始化kw_token*/: "get",
+    },
+    "http://www.kuwo.cn/api/www/ csrf=$kw_token": {
+        "search-kuwo;key": "get:data.list                                 search/searchMusicBykeyWord?&pn=1&rn=30#singername=artist&songname=name&priced=isListenFee",
+        "music-info;mid": "get:data                                       music/musicInfo",
+    },
+    "http://www.kuwo.cn/api/v1/www/": {
+        "play-url;mid=rid": "get:data                                              music/playUrl?type=music",
+    },
+
+    "http://newlyric.kuwo.cn/": {
+        "kuwo-lrc;rid": "get:data                                              newlyric.lrc",
     }
 })

package/coms/kugou/buildList.html

@@ -1,6 +1,6 @@
 <list ng-src="s in datas" min-width:=datas[0]?.name?320:120>
     <padding>
-        <song ng-click="run(s)" ng-class="{activate:s.hash===musicList.active_hash,imgonly:!datas[0]?.name}" ng-src="s"></song>
+        <song ng-click="run(s)" ng-class="{activate:musicList.isActived(s),imgonly:!datas[0]?.name}" ng-src="s"></song>
     </padding>
 </list>
 <loading ng-if="datas.is_loading"></loading>

package/coms/kugou/buildList.js

@@ -6,7 +6,7 @@ function main(dataid, datapath) {
         padding,
         song,
         loading,
-        musicList,
+        musicList:kugou$musicList,
         async run(s) {
             if (!s.hash && s.hashid) {
                 await data.from("song-mix", s, function (a) {
@@ -15,7 +15,7 @@ function main(dataid, datapath) {
                 });
             }
             if (s.hash) {
-                kugou$player.play(s.hash);
+                kugou$player.play(s);
             } else {
                 go(datapath, s);
             }

package/coms/kugou/buildScroll.js

@@ -11,7 +11,7 @@ function Main(dataid, datapath, titleid) {
         datapath,
         run(s) {
             if (s.hash) {
-                this.player.play(s.hash);
+                this.player.play(s);
             } else {
                 go(datapath, s);
             }

package/coms/kugou/getSandbox.js

@@ -1,6 +1,6 @@
 var getSandbox = function (xhr) {
     var bodyHTML = String(xhr.responseText || xhr.response || "").replace(RegBodyExp, "$1").replace(RegScriptExp, "").replace(/\son/ig, " no").replace(/\s(src|href)/g, " s$1");
-    var sandbox = createElement(div);
+    var sandbox = document.createElement("div");
     sandbox.innerHTML = bodyHTML;
     return sandbox;
 }

package/coms/kugou/krc.js

@@ -2,7 +2,11 @@ var secret = [64, 71, 97, 119, 94, 50, 116, 71, 81, 54, 49, 45, 206, 210, 110, 1
 var isTrident = /Trident/i.test(navigator.userAgent);
 function krc(list = div()) {
     care(list, function (info) {
-
+        console.log(info)
+        if (info.type !== "kugo") {
+            remove(list.children);
+            return;
+        }
         cross("get", `http://lyrics.kugou.com/search?ver=1&man=yes&client=pc&keyword=${info.songName}&duration=${info.time}&hash=${info.hash}`).done(function (response) {
             if (!response.response) return;
             var liric = JSON.parse(response.response);
@@ -109,17 +113,17 @@ function createKRC(krc) {
             }
         }
     };
-    var markerLabel = createElement(div);
+    var markerLabel = document.createElement("div");
     return krcList;
 }
 function createCell(word) {
     var label = word.label;
-    var cell = createElement("span");
+    var cell = document.createElement("span");
     text(cell, label);
     return cell;
 }
 function createRow(data) {
-    var row = createElement(div);
+    var row = document.createElement("div");
     var cells = data.words.map(createCell);
     appendChild(row, cells);
     return row;

package/coms/kugou/musicList.js

@@ -1,6 +1,41 @@
 var musicList = data.getInstance("musicList");
+var actived = null;
 musicList.forEach(function (music) {
-    if (music.activate) {
-        musicList.active_hash = music.hash;
+    if (music.activate) actived = music;
+});
+
+var isSameSong = function (m1, m2) {
+    return m1 === m2 || m1.mid && m1.mid === m2.mid || m1.hash && m1.hash === m2.hash;
+};
+
+function addMethod(name, func) {
+    Object.defineProperty(musicList, name, {
+        value: func,
+        enumerable: false
+    });
+}
+addMethod("setActive", function (m) {
+    if (actived !== m) {
+        if (actived && actived !== m) {
+            actived.activate = false;
+        }
+        actived = m;
     }
+});
+addMethod("remove", function (music) {
+    for (var cx = this.length - 1; cx >= 0; cx--) {
+        if (isSameSong(this[cx], music)) musicList.splice(cx, 1);
+    }
+});
+
+addMethod('indexOf', function (music, i) {
+    for (var cx = i || 0, dx = this.length; cx < dx; cx++) {
+        if (isSameSong(this[cx], music)) return cx;
+    }
+});
+addMethod('getActived', function () {
+    return actived;
+});
+addMethod('isActived', function (m) {
+    return actived && m && isSameSong(m, actived);
 });

package/coms/kugou/page.js

@@ -4,14 +4,14 @@
 // var document=this.document;
 // document["body"].appendChild(this.document.createElement("input"));
 var createBottomBar = function (buttonsConfig) {
-    var bar = createElement(div);
+    var bar = document.createElement("div");
     addClass(bar, "bottom-bar");
     var button_count = 0;
     for (var k in buttonsConfig) button_count++;
-    var btnArea = createElement(div);
+    var btnArea = document.createElement("div");
     css(btnArea, "width:" + (100 / button_count) + "%;");
     maxWidth(btnArea, 100);
-    var line = createElement(btnArea);
+    var line = btnArea.cloneNode();
     inlineBlock(btnArea);
     var active = function (ratio) {
         if (ratio >= .6) {
@@ -29,11 +29,11 @@ var createBottomBar = function (buttonsConfig) {
     var index = 0;
     for (var k in buttonsConfig) {
         var [url, info] = buttonsConfig[k].split(":");
-        var btn = createElement(btnArea);
+        var btn = btnArea.cloneNode();
         btn.url = url;
         btn.searchInfo = info;
         btn.active = active;
-        btn.container = createElement(div);
+        btn.container = document.createElement("div");
         btn.index = index++;
         btn.innerHTML = k;
         onclick(btn, function () {
@@ -83,7 +83,7 @@ onappend(pages, function () {
     if (!isFinite(index)) index = 1;
     pages.go(index);
 });
-var page = createElement(div);
+var page = document.createElement("div");
 appendChild(page, pages, bar);
 ontouchstart(page, kugou$dragview);
 onmousedown(page, kugou$dragview);

package/coms/kugou/playList.html

@@ -4,7 +4,7 @@
 </div>
 <list class="body" ng-src="(p,i) in musicList" min-width=480>
     <padding ng-delete="remove(i)">
-        <song ng-click="play(i)" ng-class="{activate:p.hash===musicList.active_hash}" ng-src=p></song>
+        <song ng-click="play(i)" ng-class="{activate:musicList.isActived(p)}" ng-src=p></song>
     </padding>
 </list>
 <div foot>

package/coms/kugou/playList.js

@@ -24,7 +24,6 @@ var $scope = {
     },
     remove(i) {
         var list = kugou$musicList.slice(0);
-        list.active_hash = kugou$musicList.active_hash;
         list.splice(i, 1);
         data.setInstance("musicList", list, true);
     },

package/coms/kugou/playList.less

@@ -12,13 +12,20 @@
     margin-top: 0;
     transition: margin .2s ease-out;
     color: #fff;
+    border: 1px solid;
 }
->.head{
+
+>.head {
     background: inherit;
+    border-bottom: 1px solid;
 }
->.foot{
+
+>[foot] {
     background: inherit;
+    border-top: 1px solid;
+    padding-bottom: 6px;
 }
+
 >list.body {
     overflow-x: hidden;
     overflow-y: scroll;