efront 3.34.6 → 3.34.8

package/apps/kugou/search/search.js

@@ -8,6 +8,7 @@ function main(params, from) {
     var page = div();
     page.initialStyle = 'margin-left:100%';
     page.innerHTML = search;
+    document.title = "搜索";
     var $scope = render(page, {
         titlebar,
         back,
@@ -59,7 +60,7 @@ function main(params, from) {
             if (!keyword) return;
             var s1 = this.requestSearch("kugo", 'search', { keyword }, this.resultMap, timeout, function (s1) {
                 if (s1 instanceof Array) s1.forEach(a => {
-                    a.priced = a.privilege === 10 && (a.price_sq > 0);
+                    a.priced = a.privilege === 10
                 });
                 else s1 = [];
                 return s1;

package/coms/basic/#loader.js

@@ -579,7 +579,8 @@ var init = function (name, then, prebuilds) {
         } while (rest.length);
         track = track.map(([d, a, e]) => ` ${new Array(d + 1).join("•")} ${new Array(2 + length - a.length - d).join("-")} ${a} 溃于: ${e.reverse().join(", ")}`)
         // -->
-        console.error(`加载 ${name} 失败，${ed && ed.length ? `${ed.join(', ')} 等 ${ed.length} 个模块` : "没有其他模块"}受到影响。\r\n${track.join("\r\n")}`);
+        var report = window.performance || !window.alert ? console.error : window.alert;
+        report(`加载 ${name} 失败，${ed && ed.length ? `${ed.join(', ')} 等 ${ed.length} 个模块` : "没有其他模块"}受到影响。\r\n${track.join("\r\n")}`);
     };
     loadModule(name, function (error) {
         if (hasOwnProperty.call(modules, name)) {

package/coms/basic/Matrix.js

@@ -84,8 +84,11 @@ class Matrix extends Array {
     }
 }
 class MathMatrix extends Matrix {
+    getTransform() {
+        return [this[0], this[1], this[3], this[4], this[6], this[7]];
+    }
     toDOMString() {
-        if (this.size()[1] === 2) return `matrix(${[this[0], this[1], this[3], this[4], this[6], this[7]]})`;
+        if (this.size()[1] === 2) return `matrix(${this.getTransform()})`;
         return `matrix(${this})`;
     }
 
@@ -222,8 +225,11 @@ class MathMatrix extends Matrix {
 
 }
 class MatrixTransposed extends Matrix {
+    getTransform() {
+        return [this[0], this[3], this[1], this[4], this[2], this[5]];
+    }
     toDOMString() {
-        if (this.size()[1] === 2) return `matrix(${[this[0], this[3], this[1], this[4], this[2], this[5]]})`;
+        if (this.size()[1] === 2) return `matrix(${this.getTransform()})`;
         return `matrix(${this.transpose()})`;
     }
     static transform(B, dots) {

package/coms/basic/Speed.js

@@ -97,14 +97,19 @@ inertia.MOVING = 移动;
 inertia.SLOWING_DWON = 减速;
 inertia.REBOUNDING = 回弹;
 inertia.DOCKING = 停靠;
-
+var performance = window.performance;
+if (!performance || !performance.now) performance = Date;
+var now = performance.now;
+if (!performance.now) performance.now = function () {
+    return +new Date;
+}
 class Speed extends Array {
     cache = [];
     stamp = 0;
     deltat = 0;
     accelerate = .1;
     static now() {
-        return performance.now ? performance.now() : Date.now();
+        return performance.now();
     }
     static inertia = inertia;
     reset() {
@@ -119,6 +124,7 @@ class Speed extends Array {
     }
     write(values, stamp = Speed.now()) {
         if (values.length !== this.length || this.length && this.cache.length < 2) this.unset();
+        if (stamp - this.cache[this.cache.length - 1] === 0) return;
         this.cache.push(values, stamp);
         if (this.cache.length > 20) this.cache.splice(0, 12);
         var start = Math.max(this.cache.length - 6, 0);

package/coms/basic/awaitable.js

@@ -4,7 +4,7 @@
  * @param {Element|Object|any} image;
  */
 function awaitable(image) {
-    if (image.complete) return image;
+    if (image.complete || image.then) return image;
     var oks = [];
     var ohs = [];
     var resolved = false,

package/coms/{zimoli → basic}/color.js

@@ -162,7 +162,7 @@ var hex256 = function (num) {
 	return num.toString(16);
 }
 var hex16 = function (num) {
-	num = trim16(num);
+	num = trim16(num / 17);
 	return num.toString(16);
 }
 function color(rgba) {
@@ -242,6 +242,9 @@ function parse(color) {
 		return [R, G, B, A >= 0 ? A / 0xff : 1];
 	}
 }
+var maybe16 = function (n) {
+	return (n >> 4) === (n & 0xf);
+}
 function stringify(color) {
 	var [R, G, B, a] = color;
 	if (a >= 0 && a < 1) {
@@ -250,9 +253,11 @@ function stringify(color) {
 		B = B.toFixed();
 		a = +a.toFixed(3);
 		return `rgba(${R},${G},${B},${a})`;
-	} else {
-		return "#" + [R, G, B].map(hex256).join("");
 	}
+	if (maybe16(R) && maybe16(G) && maybe16(B)) {
+		return "#" + [R, G, B].map(hex16).join("");
+	}
+	return "#" + [R, G, B].map(hex256).join("");
 }
 function doWith(manager, color, args) {
 	var isparsed = color instanceof Array,
@@ -317,6 +322,11 @@ var colorReg = /(?:rgb|hsl)a?\s*\([\,\.\d\s%]+\)|#[\da-f]{3,8}/ig;
 function isColor(text) {
 	return rgbReg.test(text) || rgbHex.test(text) || rgbHex2.test(text) || hslReg.test(text);
 }
+function format(color) {
+	var c = parse(color);
+	if (!c) return color;
+	return stringify(c);
+}
 var replacer = function (match) {
 	if (!isColor(match)) return match;
 	if (colorDesigner.rotate !== 0) {
@@ -325,7 +335,7 @@ var replacer = function (match) {
 	if (colorDesigner.contrast !== 1) {
 		match = color.contrast(match, colorDesigner.contrast);
 	}
-	return match;
+	return format(match);
 };
 var colorDesigner = {
 	rotate: 0,

package/coms/basic/decodeUTF16.js

@@ -1,13 +1,14 @@
-function decodeUTF16(buff) {
+function decodeUTF16(buff, be = true) {
     var dist = [];
+    var dec = be ? (a, b) => a << 8 | b : (a, b) => b << 8 | a;
     for (var cx = 0, dx = buff; cx < dx; cx += 2) {
-        var m = (buff[cx] << 8) + buff[cx + 1];
+        var m = dec(buff[cx], buff[cx + 1]);
         var t;
         if (m > 0b1101111111111111 || m < 0b1101100000000000) {
             t = m;
         }
         else {
-            var n = (buff[cx + 2] << 8) + buff[cx + 3];
+            var n = dec(buff[cx + 2], buff[cx + 3]);
             if (n < 0b1101100000000000 || n > 0b1101111111111111) {
                 continue;
             }

package/coms/basic/encodeUTF16.js

@@ -1,5 +1,5 @@
 function numberUTF16(t, dist = []) {
-   if (t > 0x10ffff) {
+    if (t > 0x10ffff) {
         throw new Error("编码错误");
     }
     if (t <= 0xffff) {
@@ -11,12 +11,27 @@ function numberUTF16(t, dist = []) {
     }
     return dist;
 }
-function encodeUTF16(strings) {
+function numberUTF16LE(t, dist = []) {
+    if (t > 0x10ffff) {
+        throw new Error("编码错误");
+    }
+    if (t <= 0xffff) {
+        dist.push(t & 0xff, t >> 8);
+    }
+    else {
+        t -= 0x10000;
+        dist.push(t >> 10 & 0xff, 0b11011000 | t >> 18, t & 0xff, t >> 8 & 0b00000011 | 0b11011100);
+    }
+    return dist;
+
+}
+function encodeUTF16(strings, be = true) {
     var dist = [];
+    var utf16 = be ? numberUTF16 : numberUTF16LE;
     for (var cx = 0, dx = strings.length; cx < dx; cx++) {
         var s = strings.codePointAt(cx);
         if (s > 0xffff) cx++;
-        numberUTF16(s, dist);
+        utf16(s, dist);
     }
     return dist;
 }

package/coms/basic/renderExpress.js

@@ -81,7 +81,7 @@ function main(express) {
             add_exp(str);
         }
         lastIndex = match.index + m.length;
-        if (match[1]) {
+        if (match[1] || match[0] === '?' && (express.length <= lastIndex || /[\]\}\)]/.test(express.charAt(lastIndex)))) {
             exp.push(match[1]);
         }
         else if (/[\[\{\(]/.test(m)) {

package/coms/basic_/readme.md

@@ -31,18 +31,18 @@
     ```
     以上几个方法`ie9+`系列浏览器已支持，但`ie8`及以下版本不支持，如果没有指定`--no-polyfill`参数`efront`在降级编译期会使用`[]map.js`中提供的方法进行修补，这些方法会在加载器检测到浏览器不支持`[].map`时进行初始化
 4. ```javascript
-    Object.assign
     Array.prototype.fill
-    ```
-    以上两个原生方法`ie`系列浏览器均不支持，由于经常被`efront`开发者使用，在降级编译期，如果没有指定`--no-polyfill`参数，将由`efront`处理成替代品，当前的处理方案如下：
-    ```javascript
-    Object.assign // 由 extend 替代，见 ../basic/extend.js
-    Array.prototype.fill //..将按使用的目的进行不同的替换
     Array(3).fill(0) // 类似这种的将变成[0,0,0]一个常量数组
     var [a,b,c]=Array(3).fill(0).map((_,i)=>i+1) // 类似这种用于生成常量并赋值的，将直接变成赋值语句 var a=1,b=2,c=3
     Array(3).fill(a)// 类似这种非常量的，将由类似 ArrayFill(3,a) 的语句替换
     ```
+    `Array(...).fill(...).map(...)`这种写法经常被`efront`开发者用来生成自增赋值序列，并且非所有运行环境都支持，所以包括其它显式用到`Array.prototype.fill`的几种写法都会被替换。为了目标代码的性能考虑，这种替换在自动常量化之前就要执行，所以不再支持用`polyfill`的开关进行关闭。如果要关闭，请使用参数`--no-autoeval`将自动常量化的功能一同关闭。
+
 5. ```javascript
+    Object.assign
+    ```
+    Object.assign,`ie`系列浏览器均不支持，由于经常被`efront`开发者使用，在降级编译期，如果没有指定`--no-polyfill`参数，将由`efront`处理成替代品[extend](../basic/extend.js)
+6. ```javascript
     Promise
     Promise.prototype.then
     Promise.prototype.catch
@@ -52,13 +52,13 @@
     Promise.resolve
     ```
     `Promise`对象也是`ie`系列浏览器均不支持的。`efront`实现的`Promise`与原生的特性并不一致，仅在运行环境不支持的时候进行替代。比如由`.then`触发的方法与`setTimeout`触发的方法执行的先后顺序会与高级的运行环境有所区别，但也会保持在当前语境执行后再执行相关的语句。以上没有提到的`Promise`相关的方法均不支持，如`Promise.prototype.finally`，如果您使用了这些缺失的特性，就只能自己实现或找类似[core-js](https://github.com/zloirock/core-js)的库填充了
-6. ```javascript
+7. ```javascript
     obj.if
     obj.catch
     obj.for
     ```
     类似这种用`.`取属性的语句，由于属性名与`js`的保留字一样，`ie6`等浏览器会报错，但您可以在`efront`提供的环境中放心使用。因为`efront`本身就会把取属性的语句处理掉。
-7. `ie8`及以下浏览器中存在的一些与现代`js`标准不同的特性，`efront`提供的组件可能不兼容，在处理为这类环境进行应用开发时，应避免使用。
+8. `ie8`及以下浏览器中存在的一些与现代`js`标准不同的特性，`efront`提供的组件可能不兼容，在处理为这类环境进行应用开发时，应避免使用。
     ```javascript
     Object.defineProperty(...);
     ({

package/coms/kugou/dance.js

@@ -1,10 +1,28 @@
-var activeDevice;
+var activeDevice, ratio = 1;
 function line(buffer, style, lineWidth = window.devicePixelRatio || 1) {
     var canvas = this;
     var context = canvas.getContext("2d");
     context.moveTo.apply(context, buffer[0]);
     context.beginPath();
     var { width, height } = canvas;
+    var lasty = buffer[0][1], deltay = 0, changed = 0;
+    for (var cx = 1, dx = Math.min(100, buffer.length); cx < dx; cx++) {
+        var [, y] = buffer[cx];
+        if (y > lasty) {
+            if (deltay < 0) {
+                changed++;
+            }
+            deltay = 1;
+        }
+        else {
+            if (deltay > 0) {
+                changed++;
+            }
+            deltay = -1;
+        }
+        lasty = y;
+    }
+    ratio = (dx - changed / 2) / dx;
     for (var cx = 1, dx = buffer.length; cx < dx; cx++) {
         var [x, y] = buffer[cx];
         context.lineTo(x * width, y * height);
@@ -13,7 +31,37 @@ function line(buffer, style, lineWidth = window.devicePixelRatio || 1) {
     context.lineWidth = lineWidth;
     context.stroke();
 }
+var linkImage;
+var danceIcon = lazy(async function (theta) {
+    if (!linkImage) linkImage = new Image, linkImage.canvas = document.createElement("canvas");
+    var canvas = linkImage.canvas;
+    /**
+     * @type {CanvasRenderingContext2D}
+    */
+    var context = canvas.getContext("2d");
+    var size = 32;
+    if (linkImage.src !== shortcurt.getHref()) {
+        linkImage.src = shortcurt.getHref();
+        await awaitable(linkImage);
+        canvas.width = size;
+        canvas.height = size;
+    }
+    context.setTransform(1, 0, 0, 1, 0, 0);
+    context.clearRect(0, 0, size, size);
+    var matrix = Matrix.create2d(0);
+    matrix.translate(-size >> 1, -size >> 1);
+    matrix.rotate(-theta);
+    matrix.scale(ratio);
+    matrix.translate(size >> 1, size >> 1);
+    context.setTransform.apply(context, matrix.getTransform());
+    context.drawImage(linkImage, 0, 0, size, size);
+    shortcurt.href = canvas.toDataURL();
+}, -120);
+/**
+ * @this {HTMLCanvasElement}
+ */
 function draw(buffer) {
+    danceIcon(buffer.theta);
     var canvas = this;
     var context = canvas.getContext("2d");
     if (canvas.width !== canvas.offsetWidth * devicePixelRatio) canvas.width = canvas.offsetWidth * devicePixelRatio;
@@ -57,6 +105,6 @@ function draw(buffer) {
 
 function dance(elem) {
     var canvas = /^canvas$/i.test(elem.tagName) ? elem : document.createElement("canvas");
-    care(canvas, draw);
+    if (canvas.getContext) care(canvas, draw);
     return canvas;
 }

package/coms/kugou/krc.js

@@ -9,6 +9,10 @@ function krc(list = div()) {
                 appendChild(list, children);
                 list.process = children.process;
             }
+            else {
+                list.process = Function.prototype;
+                document.title = `${info.songName} - ${info.singerName}`;
+            }
             return;
         }
         var content = info.krc.slice(4).map((a, i) => a ^ secret[i % 16]);
@@ -23,23 +27,32 @@ function krc(list = div()) {
 }
 function createLRC(lrc) {
     var saved_rows = [];
+    var reg = /^\s*\[(.*?)\](.*?)$/;
     for (var row of lrc.split(/[\r\n]+/)) {
-        var data = /^\s*\[(.*?)\](.*?)$/.exec(row);
+        var data = reg.exec(row);
         if (!data) {
             if (!isProduction) console.info("%c未解析%c", "color:#c28", "color:#333", row, data);
             continue;
         }
-        var [, time, words] = data;
-        var startTime = 0;
-        var times = time.split(":");
+        var times = [];
+        while (data) {
+            var [, time, words] = data;
+            times.push(time);
+            data = reg.exec(words);
+        }
         while (times.length) {
-            startTime = startTime * 60 + +times.shift();
+            var time = times.pop();
+            var startTime = 0;
+            let t = time.split(":");
+            while (t.length) {
+                startTime = startTime * 60 + +t.shift();
+            }
+            saveToOrderedArray(saved_rows, {
+                value: startTime,
+                startTime,
+                text: words
+            });
         }
-        saveToOrderedArray(saved_rows, {
-            value: startTime,
-            startTime,
-            text: words
-        });
     }
     var krcList = saved_rows.map(a => {
         var r = document.createElement('div');
@@ -77,6 +90,7 @@ function setClass(krcList, index) {
     removeClass(ele, "after before after-active before-active");
     addClass(krcList[index - 1], 'before-active');
     addClass(ele, "active");
+    if (ele.innerText) document.title = ele.innerText;
     krcList.slice(index + 1).map(function (a) {
         removeClass(a, "before active after-active before-active");
         addClass(a, "after");

package/coms/kugou/player.js

@@ -8,7 +8,6 @@ var patchMusicInfo = async function (info) {
     switch (info.type) {
         case "qqjt":
             info.lrc = (await cross("get", info.lyric)).response;
-            console.log(info)
             res = await data.from("qqjt-url", qqjc({
                 TSID: info.id
             }))
@@ -167,8 +166,9 @@ var $scope = {
         }
         $scope.currentTime = filterTime(currentTime, duration);
         $scope.totalTime = filterTime(duration, duration);
-        $scope.currentRotate = `rotate(${currentTime * 6}deg)`;
-        $scope.currentTheta = ((currentTime * 6 + 90) % 180 - 90) / 180 * Math.PI;
+        $scope.currentRotate = `rotate(${-currentTime * 6}deg)`;
+        $scope.quickTheta = currentTime / 3 * Math.PI;
+        $scope.currentTheta = (90 - (currentTime * 6 + 90) % 180) / 180 * Math.PI;
         playState.width = (currentTime * 100 / duration).toFixed(2) + `%`;
         $scope.currentProcess = `width:` + playState.width;
     },
@@ -207,6 +207,8 @@ var $scope = {
         if (player.offsetHeight <= calcPixel(80)) {
             var centerx = 44 / width, centery = .5;
             var start = 11 * ratio | 0, end = 77 * ratio | 0;
+            var cost = cos(currentTheta);
+            var sint = sin(currentTheta);
             for (var cx = start, dx = end; cx < dx; cx++) {
                 var [x, y] = buf[cx];
                 y -= 0.1;
@@ -214,24 +216,26 @@ var $scope = {
                     x = (x - centerx) * width;
                     y = (y - centery) * height;
                     y = y * cos(x / 66 * Math.PI);
-                    var x1 = cos(currentTheta) * x - sin(currentTheta) * y,
-                        y1 = cos(currentTheta) * y + sin(currentTheta) * x;
+                    var x1 = cost * x - sint * y,
+                        y1 = cost * y + sint * x;
                     buf[cx][0] = x1 / width + centerx;
                     buf[cx][1] = y1 / height + centery;
                 } else {
                     buf[cx][1] = y;
                 }
             }
-            cast($scope.dance, [{
+            buf = [{
                 data: buf.slice(0, start),
             }, {
                 data: buf.slice(start, end)
             }, {
                 data: buf.slice(end)
-            }]);
-        } else {
+            }]
+
             cast($scope.dance, buf);
         }
+        buf.theta = $scope.quickTheta || 0;
+        cast($scope.dance, buf);
     },
     playid: 0,
     play(music = musicList.getActived()) {
@@ -342,8 +346,7 @@ if (hasContext) {
     var animate = function () {
         if (analyser) {
             analyser.getByteTimeDomainData(dancingArray);
-            // console.log(dancingArray);
-            $scope.draw(dancingArray);
+            if ($scope.playing) $scope.draw(dancingArray);
         }
         requestAnimationFrame(animate);
     };

package/coms/kugou/shortcurt.js

@@ -0,0 +1,8 @@
+var shortcurt = document.querySelector("link[type='image/x-icon']");
+shortcurt._href = shortcurt.href;
+shortcurt.setHref = function (href) {
+    shortcurt._href = shortcurt.href = href;
+};
+shortcurt.getHref = function () {
+    return shortcurt._href;
+};

package/coms/zimoli/cless.js

@@ -52,7 +52,6 @@ function cless(commFactory, innerCss, className) {
         var stylesheet = document.createElement("style");
         stylesheet.type = "text/css";
         stylesheet.savedText = innerCss;
-        innerCss = color.transform(innerCss);
         if (stylesheet.styleSheet) {
             stylesheet.styleSheet.cssText = innerCss;
         } else {

package/coms/zimoli/data.js

@@ -318,7 +318,9 @@ var isWorseIE = /msie\s+[2-9]/i.test(navigator.userAgent);
 var parseData = function (sourceText) {
     if (/^\s*<[^\s\'\"\`]/i.test(sourceText)) {
         if (!isWorseIE && window.DOMParser) {
-            return new window.DOMParser().parseFromString(sourceText, "text/html");
+            try {
+                return new window.DOMParser().parseFromString(sourceText, "text/html");
+            } catch (e) { }
         }
         // XML 格式
         var { implementation } = document;

package/coms/zimoli/speed.js

@@ -2,7 +2,7 @@
 function speed() {
     var speed = new Speed();
     return function (a) {
-        var now = performance.now ? performance.now() : Date.now();
+        var now = Speed.now();
         if (isFinite(a)) {
             if (a === 0) speed.reset();
             else speed.write([a], now);

package/coms/zimoli/zimoli.js

@@ -190,7 +190,7 @@ var page_generators = {};
 var loading_tree = {};
 var getpgpath = function (pagepath) {
     pagepath = /^[@#!]/.test(pagepath) ? pagepath.slice(1) : pagepath;
-    if (pagepath === 'main') pagepath = efrontPath || "/main";
+    if (pagepath === 'main') pagepath = modules.efrontPath || "/main";
     return pagepath;
 };
 function createState(pgpath) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.34.6",
+    "version": "3.34.8",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {