efront 4.18.4 → 4.19.1

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

@@ -1,3 +1,48 @@
+- zh-CN: 数据标识不能是纯数字
+  en:    The data identifier cannot be a pure number
+
+- zh-CN: "数据标识不能有“@”符号"
+  en:    "Data identification cannot have the \"@\" symbol"
+
+- zh-CN: 数据标识不能有特殊符号“$1”
+  en:    "Data identification cannot have special symbol '$1'"
+
+- zh-CN: 数据中不能有$1字段
+  en:    There cannot be a $1 field in the data
+
+- zh-CN: 您不能修改其他用户的数据
+  en:    You cannot modify the data of other users
+
+- zh-CN: 请不要冒充其他用户！
+  en:    Please do not impersonate other users!
+
+- zh-CN: 数据标识不可更改！
+  en:    The data identifier cannot be changed!
+
+- zh-CN: 请设置用户名
+  en:    Please set a username
+
+- zh-CN: 请登录后重试
+  en:    Please log in and try again
+
+- zh-CN: 参数异常
+  en:    Parameter exception
+
+- zh-CN: 您不能删除别人的数据
+  en:    "You cannot delete someone else's data"
+
+- zh-CN: 用户不存在！
+  en:    The user does not exist!
+
+- zh-CN: $1 被 $2 覆盖
+  en:    $1 is covered by $2
+
+- zh-CN: 是否公开
+  en:    Is it publicly available
+
+- zh-CN: 确定要删除标识为“$1”的$2“$3”吗？
+  en:    "Are you sure you want to delete the $2 \"$3\" marked as \"$1\"?"
+
 - zh-CN: $1已存在
   en:    $1 already exists
 

package/apps/kugou/main.js

@@ -6,4 +6,20 @@ data.getApi("kuwo-token").then(function (api) {
 zimoli.switch("", null, "/home");
 zimoli.enableTouchBack();
 css("body", "background-color:#323336;");
-zimoli();
+zimoli();
+document.addEventListener('dragover', function (e) {
+    e.preventDefault();
+})
+var parseSongsList = await init('parseSongsList');
+document.addEventListener('drop', function (e) {
+    e.preventDefault();
+    var { files } = e.dataTransfer;
+    var objs = [];
+    for (var f of files) {
+        var url = URL.createObjectURL(f);
+        objs.push({ url, name: f.name });
+    }
+    objs = parseSongsList(objs);
+    musicList.push(...objs);
+    player.play(objs[0]);
+})

package/apps/kugou/song/list.js

@@ -1 +1 @@
-buildList(['song/list.jsp', 'songs-list']);
+buildList(['efront-song', 'songs-list']);

package/apps/pivot/api.yml

@@ -19,7 +19,9 @@
   daadd: put /:dbid/
   dbfind: get /:dbid/:last,:size
   dbadd: put /:id
+  dbset: post /:id
   dbdel: delete /:id
+  dadel: delete /:dbid/:id
   count: options ::count
   bootlog: options ::similar
   link: options ::link

package/apps/pivot/db/config.xht

@@ -4,7 +4,7 @@
         height: 100%;
         display: block;
         position: relative;
-        padding-right: 0!important;
+        padding-right: 0 !important;
         overflow: hidden;
     }
 
@@ -23,15 +23,21 @@
 </style>
 
 <div head>
-    <span -bind="db.name"></span>
+    数据配置 - <span -bind="db.name"></span>
 </div>
 <div body>
-    <div>权限</div>
-    <div>是否公开<swap -model="db.open"></swap></div>
+    <field -repeat="f in fields" -src="[f,db]"></field>
 </div>
 <div foot>
-    <button>保存</button>
+    <button @click="save">保存</button>
 </div>
 <script>
+    var fields = refilm`
+    是否公开/open swap`;
     var [db] = arguments;
+    var save = async function () {
+        await data.from('dbset', db);
+        history.back();
+    };
+    console.log(db)
 </script>

package/apps/pivot/db/edit.xht

@@ -1,47 +1,101 @@
-<div>
+<style>
+    [item] {
+        position: relative;
+
+        drop {
+            display: none;
+        }
+
+        &:hover {
+            outline: 1px solid #333;
+            outline-offset: -2px;
+
+            drop {
+                display: block;
+            }
+        }
+
+    }
+
+    [m-id] {
+        font-size: 10px;
+        color: #999;
+    }
+
+    & {
+        width: 100%;
+        border-top: 28px solid transparent;
+        height: 100%;
+    }
+
+    [head] {
+        line-height: 28px;
+        margin-top: -32px;
+    }
+</style>
+<div head>
     编辑数据 - <span -bind="db.name"></span>
     <a @click="add">添加</a>
 </div>
 
-<div>
-    <lattice -src="m in items">
-        <div -bind="m.id"></div>
-        <div -bind="m.name"></div>
-    </lattice>
-</div>
+<lattice body -src="m in items">
+    <padding item>
+        <drop @click="rm(m)"></drop>
+        <div m.id?></div>
+        <div m.name?></div>
+    </padding>
+</lattice>
 <script>
     var [db] = arguments;
     var a = button;
-    var add = function () {
+    var items = null;
+    var load = function (params) {
+        items = data.from('dbfind', { dbid: db.id, size: 60 });
+        return items;
+    };
+    var rm = async function (m) {
+        var res = await confirm(i18n`确定要删除标识为“${`<span style=color:red >${m.id}</span>`}”的${db.name}“${`<span style='color:red'>${m.name}</span>`}”吗？`, [i18n`确定`, i18n`取消`]);
+        if (!res) return;
+        await data.from('dadel', { dbid: db.id, id: m.id });
+        return load();
+    };
+    var add =async function () {
         var elem = document.createElement('jsoncode');
         elem.type = 'json';
         elem.contentEditable = true;
-        return prompt(茨菰$编辑框(elem), '输入JSON格式的数据', function (text) {
+        await prompt(茨菰$编辑框(elem), '输入JSON格式的数据', function (text) {
             try {
                 JSON.parse(text);
                 return true;
             } catch (e) {
-                console.log(text, e)
                 return false;
             }
         }, {
             wrap: true,
             async submit(text) {
                 var d = JSON.parse(text);
-                if (db.id === '用户') {
-                    if (!d.id && !d.password) {
-                        return alert("缺少密码！");
+                var upload = async function (d) {
+                    if (!isObject(d)) return;
+                    if (db.id === '用户') {
+                        if (!d.id && !d.password) {
+                            return alert("缺少密码！");
+                        }
+                        if (d.password) {
+                            delete d.password;
+                            d.a = encode62.geta(d.password);
+                        }
                     }
-                    if (d.password) {
-                        delete d.password;
-                        d.a = encode62.geta(d.password);
+                    await data.from('daadd', { dbid: db.id, ...d })
+                }
+                if (Array.isArray(d)) {
+                    while (d.length) {
+                        await upload(d.pop());
                     }
                 }
-                data.from('daadd', { dbid: db.id, ...d })
+                else await upload(d);
             }
         });
+        load();
     };
-    var items = await data.from('dbfind', { dbid: db.id, size: 20 });
-
-    console.log(arguments)
+    await load();
 </script>

package/apps/pivot/db/list.xht

@@ -7,8 +7,8 @@
     }
 
     [db] {
-        display: block;
-        border: 1px solid #000;
+        outline: 1px solid #000;
+        outline-offset: -6px;
         padding: 10px 6px;
 
         h2 {

package/apps/pivot/main.js

@@ -49,7 +49,10 @@ data.bindInstance("base", async function (base) {
     cross.addDirect(base.base);
     var apimap = await data.getConfig();
     for (var k in apimap) {
-        if (/options|put/.test(apimap[k].method)) apimap[k].base = base.base;
+        var api = apimap[k];
+        if (api.base || !/^\w+\:\/\//.test(api.url)) {
+            api.base = base.base;
+        }
     }
 });
 var base = data.getInstance('base').base;

package/apps/pivot/menu.yml

@@ -2,6 +2,7 @@
 WEB:
   路径映射: /proxy/list
   文件管理: /wow/root
+  数据管理: /db/list
   长连接管理: /link/index
   字典: /dict/list
   证书管理: /cert/main

package/coms/basic/cross_.js

@@ -35,20 +35,28 @@ function isChildPath(relative, path) {
     return relative.replace(/^(.*\/)[^\/]*$/, path);
 }
 
+var encodeNA = function (a) {
+    return a.replace(/[^\u0021-\u007f]/g, encodeURI);
+};
 var getCrossUrl = function (domain, headers, encrypt) {
     if (notCross(domain, encrypt)) return domain;
     var basehost = parseURL(base).host || parseURL(location_href).host;
+    var ishttps = /^(https\:|s\/\/)/i.test(domain);
+    var _headers = serialize(headers);
+    if (_headers) _headers = "," + _headers;
+    var b = encrypt ? "!" : `*`;
     if (parseURL(domain).host === basehost) {
         if (!encrypt) return domain;
         domain = domain.replace(domainReg, "/$3$4");
+        if (_headers) domain = _headers + domain;
+    }
+    else {
+        domain = encodeNA(domain)
+            .replace(/^(s?)(\/\/)/i, "http$1:$2")
+            .replace(domainReg, (_, _1, $2, $3, $4) => {
+                return [$2, _headers, '/', $3, $4].join('');
+            });
     }
-    var _headers = serialize(headers);
-    if (_headers) _headers = "," + _headers;
-    var b = encrypt ? "!" : `*`;
-    var ishttps = /^(https\:|s\/\/)/i.test(domain);
-    domain = domain
-        .replace(/^(s?)(\/\/)/i, "http$1:$2")
-        .replace(domainReg, `$2${_headers}/$3$4`)
     if (ishttps) domain = b + domain;
     if (encrypt) domain = encode62.timeencode(encode62.safeencode(domain, encrypt));
     return base + b + domain;

package/coms/basic/data.js

@@ -431,8 +431,8 @@ function createApiMap(data) {
         fixApi(api, href);
         if (hasOwnProperty.call(apiMap, api.id)) {
             const lastApi = apiMap[api.id];
-            console.warn(i18n`多次设置的id相同的api:%c${api.id}`, 'color:red');
-            console.log(`[${api.name}](${lastApi.method} ${api.url})\r\n 被 [${api.name}](${lastApi.method} ${lastApi.url}) 覆盖`);
+            var fmat = api => `[${api.name}](${api.method} ${api.url})`;
+            console.warn(i18n`多次设置的id相同的api:%c${api.id + '%c, ' + i18n`${fmat(lastApi)} 被 ${fmat(api)} 覆盖`}`, 'color:red', 'color:');
         }
         apiMap[api.id] = api;
         api.headers = _headers;

package/coms/basic/mark_test.js

@@ -4,7 +4,7 @@ var test = function (t1, t2) {
 }
 test("11234", '1234');
 test("1234", '1234');
-await init('pinyin')
+mark.setPinyin(await init('pinyin'));
 test('我们', 'women');
 test('我们', 'wm');
 test('盛', 'cheng');

package/coms/basic/seek.js

@@ -4,7 +4,7 @@ class join {
     }
 }
 var seek = function (object, seeker) {
-    if (seeker === null || seeker === undefined || isEmpty(object)) return;
+    if (seeker === null || seeker === undefined || !isHandled(object)) return;
     if (seeker instanceof Function) {
         return seeker(object);
     }

package/coms/basic/spaces.js

@@ -0,0 +1,50 @@
+var spaceDefined = [
+    "\\u0002",
+    "\\b-\\r",// "\\b"/*8*/, "\\t"/*9*/, "\\n"/*10*/, "\\v"/*11*/, "\\f"/*12*/, "\\r"/*13*/,
+    " "/*32*/,
+    "\\u007f", "\\u00a0", "\\u00ad", "\\u034f", "\\u061c",
+    "\\u115f", "\\u1160",
+    "\\u17b4", "\\u17b5",
+    "\\u180b-\\u180e",
+    "\\u1cbb", "\\u1cbc",
+    "\\u2000-\\u200f",
+    "\\u2028-\\u202f",
+    "\\u205f-\\u206f",
+    "\\u2800", "\\u3000", "\\u3164",
+    "\\ufe00-\\ufe0f",
+    "\\ufeff", "\\uffa0",
+    "\\ufff0-\\ufff8",
+];
+var unicode = [
+    "\\ud80c\\udffc",// "\\u{133fc}",
+    "\\ud834[\\udd73-\\udd7a]"//    "\\u{1d173}-\\u{1d17a}"
+];
+
+spaceDefined.avoid = function (extra_tokens) {
+    var u0 = "[^\\ud80c][\\udc00-\\udfff]|\\ud80c[^\\udffc]";
+    var u1 = "[^\\ud834][\\udc00-\\udfff]|\\ud834[^\\udd73-\\udd7a]";
+    return `[^${extra_tokens || ''}${spaceDefined.join('')}]|${u0}|${u1}`;
+}
+var reg = new RegExp(`(?:[${spaceDefined.join('')}]|${unicode.join('|')})+`);
+var is_reg = new RegExp(`^${reg.source}$`);
+var trim_reg = new RegExp(`^${reg.source}|${reg.source}$`, 'g');
+var format_reg = new RegExp(reg.source, 'g');
+spaceDefined.reg = reg;
+spaceDefined.is_reg = is_reg;
+spaceDefined.is = function (a) {
+    return is_reg.test(a);
+};
+spaceDefined.exec = function (a) {
+    return reg.exec(a);
+};
+spaceDefined.trim = function (a) {
+    return a.replace(trim_reg, '');
+};
+var formatter = function (a) {
+    if (/[ \u2002\u00a0\u3000]/.test(a)) return ' ';
+    return '';
+};
+spaceDefined.format = function (a) {
+    return a.replace(trim_reg, '').replace(format_reg, formatter);
+};
+module.exports = spaceDefined;

package/coms/basic/submit_.js

@@ -14,7 +14,7 @@ function submit_() {
         else Object.assign(data, arg);
     }
     for (var fields of fieldsList) for (var f of fields) {
-        if (!check(data, field.needs)) continue;
+        if (!check(data, f.needs)) continue;
         var error = valid(f, data);
         if (error === "empty") {
             if (f.options instanceof Array || /date|time|range|switch|swap|radio/i.test(f.type)) {

package/coms/compile/Program.js

@@ -53,33 +53,8 @@ var stringsFromRegExp = function (reg) {
     var res = combine(...queue).map(a => a.join(""));
     return res;
 }
-var supportUnicodeRegExp = false;
-var spaceDefined = [
-    "\\u0002",
-    "\\b-\\r",// "\\b"/*8*/, "\\t"/*9*/, "\\n"/*10*/, "\\v"/*11*/, "\\f"/*12*/, "\\r"/*13*/,
-    " "/*32*/,
-    "\\u007f", "\\u00a0", "\\u00ad", "\\u034f", "\\u061c",
-    "\\u115f", "\\u1160",
-    "\\u17b4", "\\u17b5",
-    "\\u180b-\\u180e",
-    "\\u1cbb", "\\u1cbc",
-    "\\u2000-\\u200f",
-    "\\u2028-\\u202f",
-    "\\u205f-\\u206f",
-    "\\u2800", "\\u3000", "\\u3164",
-    "\\ufe00-\\ufe0f",
-    "\\ufeff", "\\uffa0",
-    "\\ufff0-\\ufff8",
-    "\\u{133fc}",
-    "\\u{1d173}-\\u{1d17a}"
-]
-try {
-    new RegExp('.', 'u');
-    supportUnicodeRegExp = true;
-} catch (e) {
-    spaceDefined.pop();
-    spaceDefined.pop();
-}
+var spaceDefined = require("../basic/spaces");
+
 var powermap = require("./powermap");
 class Program {
     quotes = [
@@ -118,7 +93,6 @@ class Program {
     structstrap_reg = /^(class|interface|struct|enum)$/;
     control_reg = /^(if|else|switch|case|do|while|for|loop|break|continue|default|import|from|as|export|try|catch|finally|throw|await|yield|return)$/;
     type_reg = /^(var|let|const|function|fn|func|class|interface|type|struct|enum|impl)$/;
-    spaces = spaceDefined;
     nocase = false
     keepspace = false;
     lastIndex = 0
@@ -1010,14 +984,12 @@ class Program {
         });
         var scopes = this.scopes.map(a => a.join("")).join("");
         scopes = this.compile(scopes);
-        var spaces = this.spaces.join("");
         tokens = Object.keys(tokens).join("");
-        tokens = this.compile(tokens) + spaces;
-        var express = `(?:\\\\u\\{[^\\}]+\\}|[^${tokens}])+`;
-        var flagUnicode = supportUnicodeRegExp ? 'u' : '';
-        this.express_reg = new RegExp(`^${express}$`, flagUnicode);
-        this.space_reg = new RegExp(`^[${spaces}]+$`, flagUnicode);
-        this.space_exp = new RegExp(`[${spaces}]+`, flagUnicode);
+        tokens = this.compile(tokens);
+        var express = `(?:\\\\u\\{[^\\}]+\\}|${spaceDefined.avoid(tokens)})+`;
+        this.express_reg = new RegExp(`^${express}$`);
+        this.space_reg = spaceDefined.is_reg;
+        this.space_exp = spaceDefined.reg;
         var quotes_entries = this.createRegExp(this.comments.concat(this.quotes).map(q => q[0]), true).source;
         var powers = Object.keys(this.powermap).filter(k => k.length > 1 && stamp_reg.test(k));
         var powers_entries = this.createRegExp(this.tags.map(t => t[0]).concat(powers), true).source;
@@ -1026,7 +998,7 @@ class Program {
         var number_reg = this.number_reg;
         var numbers = number_reg.source.replace(/^\^|\$$/g, "");
         this.digit_reg = new RegExp(/^[+\-]?/.source + numbers, number_reg.flags);
-        this.entry_reg = new RegExp([`[${spaces}]+|${quotes_entries}|[${scopes}]|${numbers}[^${tokens}]*|${express}|${powers_entries}|[${stamps}]`], "gi" + flagUnicode);
+        this.entry_reg = new RegExp([`${spaceDefined.reg.source}|${quotes_entries}|[${scopes}]|${numbers}(?:${spaceDefined.avoid(tokens)})*|${express}|${powers_entries}|[${stamps}]`], "gi");
         var stamps = this.stamps.slice();
         for (var k in this.powermap) if (k.length === 1 && stamps.indexOf(k) < 0) stamps.push(k);
         stamps.push.apply(stamps, powers);

package/coms/kugou/api.js

@@ -48,5 +48,9 @@
     "https://music.91q.com/": {// 千千静听/百度音乐
         "search-qqjt?word": "get:data.typeTrack v1/search#songname=title&singername=artist<、>.name&avatar=pic&priced=isVip",
         "qqjt-url?TSID": "get:data v1/song/tracklink#url=path"
+    },
+    "https://efront.cc/": {
+        "efront-song": "get song/list",
+        "efront-singer": "get singer/list",
     }
 })

package/coms/kugou/musicList.js

@@ -1,4 +1,7 @@
 var musicList = data.getInstance("musicList");
+backEach(musicList, (a, i) => {
+    if (a.url && /^blob\:/.test(a.url)) musicList.splice(i, 1);
+});
 var actived = null;
 musicList.forEach(function (music) {
     if (music.activate) actived = music;

package/coms/kugou/parseSongsList.js

@@ -1,10 +1,50 @@
 var singerPhotosMap = Object.create(null);
-await data.from("singer/list.jsp", function (a) {
+await data.from("efront-singer", function (a) {
     a.forEach(a => {
         var b = a.replace(/\.\w+$/, '');
         singerPhotosMap[b] = a;
     })
-})
+});
+var parseFileName = function (b) {
+    var [name, singer] = String(b).replace(/\.\w+$/, '')
+        .replace(/^\s*\d+[\s\.,\-]+(\S+)($|\W\s*\-)/, "$1$2")
+        .replace(/^\s*\d+[\.]+\s*([\s\S]+)/, "$1")
+        .replace(/^\s*\d+\s+(\W+)/, "$1")
+        .split(/\s-\s/);
+
+    if (!singer) {
+        var m = /\s+(\S+)\s*$/.exec(name);
+        if (m) {
+            var s = /^([\W\s]+\W)\s+/.exec(name);
+            if (s) {
+                singer = name.slice(s[0].length);
+                name = s[0];
+            }
+            else {
+                singer = m[1];
+                name = name.slice(0, m.index);
+            }
+
+        }
+    }
+    if (!singer) {
+        name = name.replace(/[\(（]([^\)）]+)[\)）]/, function (_, m) {
+            singer = m;
+            return ''
+        });
+    }
+    if (!singer) {
+        if (/\W\-\W/.test(name)) {
+            [name, singer] = name.split('-');
+        }
+    }
+    if (像中文人名(name) && !像中文人名(singer)) {
+        b = singer;
+        singer = name;
+        name = b;
+    }
+    return { name, singer };
+};
 return a => {
     if (isElement(a)) {
         var m = /songsdata\s*=\s*(\[[\s\S]*\])/.exec(a.innerText);
@@ -21,20 +61,24 @@ return a => {
         }, b.data);
         else if (isObject(b)) extend(data, b);
         if (typeof b === 'string') {
-            var [name, singer] = b.replace(/\.\w+$/, '').split(/\s*-\s*/);
+            var { name, singer } = parseFileName(b);
             data.name = name;
             data.singer = singer;
             data.url = "song/" + b;
-
-        } if (!data.singer) {
+        }
+        if (!data.singer) {
             data.singer = data.author_name;
         }
+        if (data.name && !data.singer) {
+            var { name, singer } = parseFileName(data.name);
+            data.name = name;
+            data.singer = singer;
+        }
         if (!data.name) data.name = data.audio_name;
         if (data.hash) data.hash = data.hash.replace(/^songs\_/i, '');
         if (data.singer) data.singer = formatSingerNames(data.singer);
         if (!data.avatar && data.singer) {
             var singer0 = data.singer.split("、")[0];
-            console.log(singer0)
             if (singer0 in singerPhotosMap) data.avatar = `singer/` + singerPhotosMap[singer0];
         }
         if (!data.singerName) data.singerName = data.singer;

package/coms/kugou/player.js

@@ -305,6 +305,7 @@ var $scope = {
         musicList.setActive(music);
         $scope.playing = true;
         playState.width = 0;
+        $scope.info = Object.assign({}, music);
         patchMusicInfo(music).then((response) => {
             if (playid !== this.playid) return;
             if (!this.playing) return;