efront 4.12.0 → 4.13.1

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1,3 +1,15 @@
+- zh-CN: 加载失败
+  en:    Loading failed
+
+- zh-CN: 发现递归请求！
+  en:    Found recursive request!
+
+- zh-CN: 您的请求信息异常！请更换浏览器重试！
+  en:    Your request information is abnormal! Please change your browser and try again!
+
+- zh-CN: 配置的域名无法生成正则表达式:$1
+  en:    "The configured domain name cannot generate a regular expression: $1"
+
 - zh-CN: 这个文件的内容不能在非nodejs环境中运行
   en:    The content of this file cannot be run in a non nodejs environment
 

package/coms/basic/parseURL.js

@@ -20,6 +20,15 @@
 // -------/// ---------------1---------------------------------///////////////////2-----3--------//////// ------4----2/////5---------------------------------------------------6------------------------------------------------------------------------------------//////////////-7--5///8-------9----------//10--11---10/8/--12----////
 var reg = /^([^\:\/\\\?#\[]+\:(?![^\:\/\\\?\#]*@|[\/\\][^\/\\]))?(?:\/\/|\\\\)?(?:(([^\:\/\\\?#]+)?(?:\:([^\/\\\?#]+))?)@)?(([^\/\\@\?\#\.]*?[^\/\\@\:\?\#\.\d][^\/\\@\:\?\#\.]*?|[^\/\\@\:\?\#\.]+(?:\:[^\@\/\\\?#\.]*[^\d\@\:\/\\\?#\.]+|(?:\.[^\/\\@\:\?\#\.]+)+))?(?:(?:\:|^)(\d+))?)(((?:\/|\\|^)[^\?#]*)?(\?([^#]*))?)(#[\s\S]*)?$/;
 class URL {
+    resolve(url) {
+        var u = new URL;
+        Object.assign(u, this);
+        if (!/^([^\:\/\\\?#\[]+\:|[\:\/\\\?#\[]+)/.test(url)) {
+            url = u.pathname.replace(/[^\/]+$/, '') + url;
+        }
+        u.locate(url);
+        return u;
+    }
     locate(url) {
         if (url === undefined || url === null) url = '';
         var [__, protocol, auth, username, password, host, hostname, port, path, pathname, search, query, hash] = reg.exec(url);

package/coms/compile//347/264/240/351/246/250.js

@@ -156,7 +156,7 @@ macros.calc = function (a) {
 };
 macros.range = function () {
     if (arguments.length === 1) {
-        return ArrayFill(arguments[0], 0).map((a, i) => i + 1);
+        return ArrayFill(arguments[0], 0).map((a, i) => i + 1).join(' ');
     }
     if (arguments.length === 3) {
         var [start, end, step] = arguments;
@@ -173,22 +173,26 @@ macros.range = function () {
         end = parseFloat(end);
         step = parseFloat(step) || 1;
         var result = [];
-        for (var temp = start; temp < end; temp += step) {
-            result.push(temp.toFixed(fixed) + unit);
+        for (var temp = start; temp <= end; temp += step) {
+            result.push(+temp.toFixed(fixed) + unit);
         }
-        return result;
+        return result.join(' ');
     }
     throw new Error(i18n`range参数错误:` + arguments);
 };
-macros.extract = function (list, index) {
-    if (typeof list === 'string') list = list.split(',');
+macros.extract = function () {
+    if (arguments.length === 2) var [list, index] = arguments;
+    else var index = arguments[arguments.length - 1], list = Array.prototype.slice.call(arguments, 0, arguments.length - 1);
+    index -= 1;
+    if (typeof list === 'string') list = getList(list);
     else if (list instanceof Array) {
-        list = createArgMap(list.concat(list.rest).join(''), ';');
+        list = list.concat(list.rest);
     }
     return list[index];
 };
 macros.length = function (list) {
-    if (typeof list === 'string') return list.split(',').length;
+    if (arguments.length !== 1) return arguments.length;
+    if (typeof list === 'string') return getList(list).length;
     else if (list instanceof Array) {
         return createArgMap(list.concat(list.rest).join(''), ';').length;
     }
@@ -202,6 +206,7 @@ macros.escape = function (a) {
 macros.e = function (a) {
     return strings.decode(a);
 };
+
 var wrapColor = function (k) {
     var f = color[k];
     macros[k] = function (c) {
@@ -231,6 +236,11 @@ macros[""] = function (a) {
     return a;
 };
 
+var getList = function (list) {
+    list = splitParams(list);
+    if (list.length === 1) list = list[0].split(/\s+/);
+    return list;
+};
 macros.each = function () {
     if (arguments.length !== 2) {
         body = arguments[arguments.length - 1];
@@ -248,7 +258,7 @@ macros.each = function () {
     if (args.length < 1) args.push("@value");
     if (args.length < 2) args.push("@key");
     if (args.length < 3) args.push("@index");
-    if (typeof list === "string") list = splitParams(list);
+    if (typeof list === "string") list = getList(list);
     else if (list instanceof Array) {
         list = createArgMap(list.concat(list.rest).join(""), ';');
     }
@@ -419,7 +429,6 @@ var getFromScopeList = function (name, varsList, value = name) {
         while (name in o) {
             name = o[name];
             if (typeof name !== 'string') return name;
-            name = strings.decode(name);
             if (!/^\-\-|^@[^\{]/.test(name)) return name;
             if (queue.indexOf(name) >= 0) throw `变量环形引用，无法初始化：${queue}`;
             queue.push(name);
@@ -480,8 +489,11 @@ var Method = function () {
 }
 var vlist = [], mlist = [macros], clist = [], base = '';
 var calcvars = function (v) {
+    var decode = /^['"`]/.test(v) ? strings.decode : a => a;
     return v.replace(/@[^\s\{\}\(\)\[\]\:\+\*\/,;\!\>\$\=\&\%\#\@'"`\?\.\/\|~#]+|@\{[^\}@]*\}/g, function (m) {
-        return getFromScopeList(m, vlist, m);
+        var value = getFromScopeList(m, vlist, m);
+        value = decode(value);
+        return value;
     }).replace(/(^|\s|[\]\)\(\[\-\+\*\/,;])(?:var\s*\(([\s\S]*?)\)|(--\S+))/g, function (m, q, a, b) {
         return q + getFromScopeList(b || a.trim(), vlist, m.slice(q.length));
     });

package/coms/compile//347/264/240/351/246/250_test.js

@@ -78,6 +78,14 @@ assert(素馨(`a{filter:grayscale(.9)}`), `a{filter:grayscale(.9);}`);
 assert(素馨(`a{each(1,2,3,4,5,(@a){a:@a})}`), `a{a:1;a:2;a:3;a:4;a:5;}`);
 assert(素馨(`each(1,(@a){a{a:@a}})a>b{b:2}`), `a{a:1;}\r\na>b{b:2;}`);
 assert(素馨(`each(2,(@a){@b:1/@a;a{a:@b}})`), `a{a:0.5;}`);
+assert(素馨(`each(2,.(@a){@b:1/@a;a{a:@b}})`), `a{a:0.5;}`);
+assert(素馨(`a{a:length(2)}`), `a{a:1;}`);
+assert(素馨(`a{b:length(2,3)}`), `a{b:2;}`);
+assert(素馨(`a{a:extract(2,1)}`), `a{a:2;}`);
+assert(素馨(`a{a:extract(2,3,2)}`), `a{a:3;}`);
+assert(素馨(`a{a:extract(2 3,2)}`), `a{a:3;}`);
+assert(素馨(`value: range(10px, 30px, 10);`, '', true), `value:10px 20px 30px;`);
+assert(素馨(`value: range(4);`, '', true), `value:1 2 3 4;`);
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].text, '-0.2em');
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].isdigit, true);
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[2].text, ".3em");

package/coms/reptile/m3u8Download.js

@@ -1,31 +1,164 @@
-var URL = require("url");
 var path = require("path");
-function main(m3u8, dst) {
-    function index(a, total) {
-        a = String(a);
-        return String(total).replace(/\d/g, function (m, index, input) {
-            if (index + a.length < input.length) return '0';
-            return a[index + a.length - input.length];
-        });
+var fs = require("fs");
+var http = require("http");
+var https = require("https");
+var parseM3U8 = function (text, url) {
+    url = parseURL(url);
+    var list = text.split(/[\r\n]+/).filter(a => !!a).map(function (name) {
+        if (/^#/.test(name)) return name;
+        name = url.resolve(name).toString();
+        return name;
+    });
+    return list;
+};
+var fillTree = function (node, pathname) {
+    var pathlist = pathname.split(/[\\\/]/);
+    for (var p of pathlist) {
+        if (!node[p]) node[p] = Object.create(null);
+        node = node[p];
+    }
+}
+var formatName = function (videos, urls) {
+    var pathMap = Object.create(null);
+    var treeMap = Object.create(null);
+    urls.forEach(function (url) {
+        var { pathname } = parseURL(url);
+        fillTree(treeMap, pathname);
+    });
+    for (var v of videos) {
+        var { pathname } = parseURL(v);
+        fillTree(treeMap, pathname);
+        pathname = pathname.replace(/^[\\\/]+/, '').replace(/[\d\-\s\~\_\:\.\/\\]+(\.\w+)$/, '$1');
+        pathname = pathname.replace(/\.[^\.\\\/]+$/, '').replace(/[\\\/]/g, '-');
+        var list = pathMap[pathname];
+        if (!list) {
+            pathMap[pathname] = [v];
+        }
+        else {
+            list.push(v);
+        }
+    }
+    var treePath = [];
+    do {
+        var treekeys = Object.keys(treeMap);
+        if (treekeys.length !== 1) break;
+        treekeys = treekeys[0];
+        treePath.push(treekeys);
+        treeMap = treeMap[treekeys];
+    } while (treeMap);
+    treePath = treePath.join('/');
+    var pathLength = treePath.length;
+    var realMap = Object.create(null);
+    for (var pathname in pathMap) {
+        var list = pathMap[pathname];
+        pathname = pathname.slice(pathLength);
+        if (list.length > 1) {
+            var ilength = String(list.length).length;
+            list = list.forEach((n, i) => {
+                var i = String(i);
+                i = Array(ilength + 1 - i.length).join("0") + i;
+                realMap[n] = pathname + "-" + i + path.extname(n);
+            });
+        }
+        else {
+            realMap[list[0]] = pathname;
+        }
     }
-    fetch(m3u8).then(function (a) {
-        var reg = /^(.*?)\?start=(\d+)&end=.*?$/;
-        var downloaded = {};
-        var list = a.toString().split(/[\r\n]+/).filter(e => e && !/^#/.test(e)).map(function (name) {
-            var match = reg.exec(name);
-            if (!match) return;
-            var file = match[1];
-            if (downloaded[file]) return;
-            downloaded[file] = true;
-            return file;
-        }).filter(a => !!a);
-        return queue.call(list, function (file, cx) {
-            console.info(file);
-            var fileurl = URL.resolve(m3u8, file);
-            return fetch(fileurl).then(function (buff) {
-                return fs2(path.join(dst, index(cx, list.length) + '.' + file)).writeSync(buff);
+    return [realMap, treePath];
+};
+var downLoad = function (url, dest) {
+    return new Promise(function (ok, oh) {
+        var h = /^https\:/.test(url) ? https : http;
+        var r = h.get(url, function (r) {
+            var w = fs.createWriteStream(dest);
+            r = decodeHttpResponse(r);
+            r.pipe(w);
+            r.once("error", function (error) {
+                w.close(function () {
+                    fs.unlink(dest, function () {
+                        oh(error)
+                    });
+                });
             });
+            w.once('error', oh);
+            w.once("finish", ok);
         });
+        r.once('error', oh);
+        r.end();
     });
+}
+var breakLine = '\r\n';
+var deepFetch = async function (url, dest) {
+    var rest = [];
+    var is_m3u8 = true;
+    var videos = [];
+    var urls = [url];
+    var commentMap = [];
+    var comments = ["#EXTM3U"];
+    do {
+        if (is_m3u8) {
+            var response = await fetch(url);
+            switch (response.status) {
+                case 0:
+                case 200:
+                case 304:
+                    var m3u8 = await response.text();
+                    urls.push(url);
+                    var list = parseM3U8(m3u8, url).reverse();
+                    if (/#EXTM3U/i.test(list[list.length - 1])) list.pop();
+                    rest.push(...list);
+                    break;
+                default:
+                    throw new Error(`加载 ${url} 失败: ${response.statusText}`);
+            }
+        }
+        else {
+            if (/^#/.test(url)) {
+                comments.push(url);
+            }
+            else {
+                commentMap[url] = comments.join(breakLine);
+                comments = [];
+                videos.push(url);
+            }
+        }
+        url = rest.pop();
+        is_m3u8 = url && /\.m3u8$/i.test(url);
+    } while (url);
 
+    var [nameMap, treePath] = formatName(videos, urls);
+    var videoname = path.basename(treePath);
+    if (!videoname) if (videos.length === 1) videoname = nameMap[videos[0]];
+    if (!videoname) {
+        if (fs.existsSync(dest)) throw new Error("目标文件夹已存在！");
+        videoname = path.basename(dest);
+        dest = path.dirname(dest);
+    }
+    if (!fs.existsSync(dest)) throw new Error("目标文件夹无效！");
+    if (path.basename(dest) !== videoname) dest = path.join(dest, videoname);
+    if (!fs.existsSync(dest)) fs.mkdirSync(dest);
+    for (var v of videos) {
+        try {
+            var d = path.join(dest, nameMap[v]);
+            if (fs.existsSync(d)) {
+                console.info(`已跳过文件 ${d}`);
+                continue;
+            }
+            console.info(`正在下载 ${v}`)
+            await downLoad(v, d);
+        } catch (e) {
+            console.error(`下载 ${v} 失败:${e}`);
+        }
+    }
+    var index = videos.map(v => {
+        var n = nameMap[v];
+        var c = commentMap[v];
+        return c + breakLine + n;
+    });
+    index.push(...comments);
+    index = index.join(breakLine) + breakLine;
+    await fs.promises.writeFile(path.join(dest, 'index.m3u8'), index);
+}
+function main(m3u8, dst) {
+    return deepFetch(m3u8, dst);
 }

package/coms/reptile/m3u8Download_test.js

@@ -1,5 +1,5 @@
 
 m3u8Download(
-    `https://1251953721.vod2.myqcloud.com/0ec02e46vodcq1251953721/7c4525705285890791033559507/playlist.m3u8`,
+    `http://localhost/绝命幽灵船/index.m3u8`,
     "/data/"
 );

package/coms/zimoli/render.js

@@ -41,6 +41,7 @@ presets.template = function (t) {
     var comment = document.createComment('template');
     comment.$scope = t.$scope;
     comment.$parentScopes = t.$parentScopes;
+    t.$comment = comment;
     if (t.$struct.binds.src) {
         care(comment, createTemplateNodes)
     }
@@ -274,7 +275,9 @@ var createRepeat = function (search, id = 0) {
         for (var k in clonedElements) {
             if (clonedElements1[k] !== clonedElements[k]) {
                 var selected = clonedElements[k].selected;
-                remove(clonedElements[k]);
+                var c = clonedElements[k];
+                if (!c.parentNode && c.$comment) remove(c.$comment);
+                else remove(clonedElements[k]);
                 if (selected) { clonedElements1[k].selected = true; }
             }
         }

package/coms/zimoli/table.html

@@ -1,8 +1,11 @@
 <thead @mounted="setFixedColumn.call(this.parentNode),setContextMenu(this)">
     <tr inline-block #adapter thead @mounted="resizeT(this)">
-        <td draggable="false" fixed row-index><mask></mask>${i18n`序号`}</td>
-        <td fixed:="f.fixed" -repeat="f in fields track by f.id" :style="{width:f.width}" @dblclick="sort(f)" swapped_="f.summary"><mask></mask><i
-                -if="f.icon" -class="f.icon"></i><span -if="f.name" -html="f.name"
+        <td draggable="false" fixed row-index>
+            <mask></mask>${i18n`序号`}
+        </td>
+        <td fixed:="f.fixed" -repeat="f in fields track by f.id" :style="{width:f.width}" @dblclick="sort(f)"
+            swapped_="f.summary">
+            <mask></mask><i -if="f.icon" -class="f.icon"></i><span -if="f.name" -html="f.name"
                 type@="typeof f.type==='string'?f.type:''"></span><template -else>&nbsp;</template>
         </td>
         <td style="min-width: 0;" draggable="false">&nbsp;</td>
@@ -10,7 +13,8 @@
 </thead>
 <tbody -src="(d,i) in data" :style="tbodyHeight(this,hasFoot)">
     <tr inline-block :style="{width:adapter.style.width}" @click="rowClick(d,i,event)" @mounted="resizeR(this)">
-        <td fixed row-index :style="adapter.firstChild.getAttribute('style')"><mask></mask><span -bind="i+1"></span>
+        <td fixed row-index :style="adapter.firstChild.getAttribute('style')">
+            <mask></mask><span -bind="i+1"></span>
         </td>
         <td fixed:="f.fixed" -repeat="(f,i) in fields" :style="adapter.children[i+1].getAttribute('style')">
             <mask></mask>
@@ -21,13 +25,16 @@
                 <span -text="o.name instanceof Function?o.name(d):o.name"></span>
             </a>
         </td>
-        <td :style="adapter.lastChild.getAttribute('style')"><mask></mask>&nbsp;</td>
+        <td :style="adapter.lastChild.getAttribute('style')">
+            <mask></mask>&nbsp;
+        </td>
     </tr>
 </tbody>
 <tfoot>
     <tr .fade -if="!data||!data.length" style="padding-bottom: 20px;">
         <td style="text-align: center;">
             <template -if="data.is_loading">${i18n`加载中`}</template>
+            <template -elseif="data.is_errored">${i18n`加载失败`}</template>
             <template -else>${i18n`无数据`}</template>
         </td>
     </tr>

package/coms/zimoli/table.js

@@ -575,7 +575,8 @@ function table(elem) {
         };
         render(this, $scope, this.$parentScopes.concat(this.$scope));
         if (isMounted(table)) setFixedColumn.call(table);
-        $scope.data = Table.from(fields, await data);
+        await data;
+        if (!data.is_errored) $scope.data = Table.from(fields, data);
         $scope.data.callback = function () {
             render.digest();
         };

package/package.json

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