efront 4.5.10 → 4.5.13

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

@@ -1,3 +1,12 @@
+- zh-CN: IP地址
+  en:    IP address
+
+- zh-CN: 绑定地址
+  en:    Bind Address
+
+- zh-CN: 证书更新失败！
+  en:    Certificate update failed!
+
 - zh-CN: 搜索
   en:    Search
 
@@ -67,8 +76,8 @@
 - zh-CN: 上次更新时间
   en:    Last update time
 
-- zh-CN: 下次更新时间
-  en:    Next update time
+- zh-CN: 下次更新日期
+  en:    Next update date
 
 - zh-CN: 自动更新周期
   en:    Automatic update cycle

package/apps/pivot/cert/update.xht

@@ -11,21 +11,20 @@
 <script>
     var form = view;
     var a = button;
-    var fields = refilm`$上次更新时间/lastUpdateTime date
-    下次更新时间/nextUpdateTime date
+    var fields = refilm`$上次更新时间/lastUpdateTime datetime
+    下次更新日期/nextUpdateTime date
     自动更新周期/schadulePeriod 天/int
     是否开启计划/schaduleEnabled swap
     `;
     var page = this;
     var [{ saveUnique, setauth, uploadOnly }] = arguments;
     var autoUpdate = async function () {
-        var o = await acme2.autoUpdate(acme2.domain, setauth, uploadOnly);
-        await saveUnique();
+        var o = await acme2.autoUpdate(saveUnique, acme2.domain, setauth, uploadOnly);
         if (o.status === 'valid') {
             alert(i18n`证书已更新！`, "success");
         }
         else {
-            alert(i18n`更新失败！`, 'error');
+            alert(i18n`证书更新失败！`, 'error');
         }
     };
     var saveSchadule = async function () {

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

@@ -19,7 +19,7 @@ function format(formater) {
     o.D = o.d;
     o.H = o.h;
     o.Day = v[v.length - 1];
-    formater.replace(/[yY年]+|[M月]+|[hH时]+|毫秒|[m+分]+|[sS]{3}|[Ss秒]+|[星期周天][dD]*|[dD]{3}|[日号dD]+/g, function (m) {
+    return formater.replace(/[yY年]+|[M月]+|[hH时]+|毫秒|[m+分]+|[sS]{3}|[Ss秒]+|[星期周天][dD]*|[dD]{3}|[日号dD]+/g, function (m) {
         if (/^[dD]{3}$/.test(m)) {
             return o.Day;
         }
@@ -32,23 +32,23 @@ function format(formater) {
             var a = m.charAt(0);
             var v = o[a];
         }
-        var l = m.replace(/\W+/g, "");
-        var b = m.split(/[\w天]+/).map(a => a || fixLength(v, l.length)).join("");
+        var l = m.split(/\W+/).map(a => a.length);
+        var b = m.split(/[\w天]+/).map((a, i) => l[i] ? a + fixLength(v, l[i]) : a).join('');
         return b;
     });
 }
-function filterTime(time, format) {
+function filterTime(time, formater) {
     if (!isHandled(time)) return '';
     if (isFinite(time)) time = +time;
     var value = new Date(time);
     if (!+value) {
         return time;
     }
-    if (format && !/^[\-\/]+$/.test(format)) {
-        return format.call(value, format);
+    if (formater && !/^[\-\/]+$/.test(formater)) {
+        return format.call(value, formater);
     }
-    if (format) {
-        format = format.charAt(0);
+    if (formater) {
+        formater = format.charAt(0);
     }
     var splited = getSplitedDate(value);
     var now = new Date;
@@ -57,8 +57,8 @@ function filterTime(time, format) {
     var today = new Date(year1, month1 - 1, date1);
     var thatday = new Date(year, month - 1, date);
     var delta = (today - thatday) / 24 / 3600000;
-    if (minute === 0) var time = hour + "点";
-    else if (minute === 30) time = hour + "点半";
+    if (minute === 0 && second === 0) var time = hour + "点整";
+    else if (minute === 30 && second === 0) time = hour + "点半";
     else time = `${hour}:${fixLength(minute)}`;
     if (delta < 7 && delta > 2) {
         if (day >= day1) {

package/coms/basic/filterTime_test.js

@@ -0,0 +1,8 @@
+assert(filterTime(''), ``);
+assert(filterTime(null), '');
+assert(filterTime(undefined), '');
+assert(filterTime("我出生的第二年"), `我出生的第二年`);
+assert(filterTime(new Date(new Date - 100)), `刚刚`);
+assert(filterTime(new Date(new Date - 60000), `h:mm`), "");
+assert(filterTime(new Date(new Date - 86400000), `M月d日 h:mm`), "");
+assert(filterTime(new Date(new Date().setFullYear(new Date().getFullYear() - 1)), `y年M月d日 h:mm`), '');

package/coms/compile/downLevel.js

@@ -317,10 +317,20 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj, islet) {
                 var a = single(d, '');
                 if (a) {
                     if (index > 0) splice(queue, i++, 0, { type: STAMP, text: ',' });
-                    splice(queue, i, 0, ...a[1], { type: STAMP, text: "=" });
-                    i += 2;
                     var i2 = skipAssignment(queue, i);
-                    killobj(queue.slice(i, i2));
+                    var restq = splice(queue, i, i2 - i, ...a[1], { type: STAMP, text: "=" });
+                    killobj(restq);
+                    if (restq.length === 1) {
+                        restq = restq[0];
+                    }
+                    else {
+                        restq.entry = "("
+                        restq.leave = ")";
+                        restq.type = SCOPED;
+                        relink(restq);
+                    }
+                    splice(queue, i += a[1].length + 1, 0, restq);
+                    i2 = i + 1;
                     if (!a[2]) var q = scanner2(a[0]);
                     else {
                         var objname = getobjname(0);

package/coms/compile/downLevel_test.js

@@ -166,7 +166,7 @@ function () {
 _1 = 'date'; return [1, 0]
 },
 function () {
-_[_1] = "desc"; _0 = (_); _0 = (_0); return [_0, 2]
+_[_1] = "desc"; _0 = _; return [_0, 2]
 })
 var _0, _1 }
 var _`);
@@ -246,7 +246,7 @@ function () {
 _2 = !_["done"]; if (!_2) return [2, 0]; _2 = _["value"]; return [_2, 1]
 },
 function (_1) {
-_2 = _1; o = _2; _2 = (true)
+_2 = _1; o = _2; _2 = true
 },
 function () {
 if (!_2) return [2, 0]; noSymbol; _2 = _0["next"](); return [_2, 1]
@@ -287,13 +287,13 @@ function (_4) {
 _5 = _4; _1 = _5; _6 = Symbol["iterator"]; _6 = _1[_6]; if (_6) return [1, 0]; _6 = Array["prototype"]; _7 = Symbol["iterator"]; _6 = _6[_7]
 },
 function () {
-_6 = (_6); _2 = _6["call"](_1); _3 = undefined; _3 = _2["next"](); o = _3["value"]; _3 = _2["next"](); s = _3["value"]; _10 = !_3; if (_10) return [1, 0]; _10 = !_3["done"]
+_2 = _6["call"](_1); _3 = undefined; _3 = _2["next"](); o = _3["value"]; _3 = _2["next"](); s = _3["value"]; _10 = !_3; if (_10) return [1, 0]; _10 = !_3["done"]
 },
 function () {
-_10 = (_10); if (!_10) return [1, 0]; _10 = _2["return"]; _10 = isFunction(_10); if (!_10) return [1, 0]; _10 = _2["return"]()
+if (!_10) return [1, 0]; _10 = _2["return"]; _10 = isFunction(_10); if (!_10) return [1, 0]; _10 = _2["return"]()
 },
 function () {
-_3 = _10; _5 = (true)
+_3 = _10; _5 = true
 },
 function () {
 if (!_5) return [2, 0]; noSymbol; _5 = _0["next"](); return [_5, 1]
@@ -341,7 +341,7 @@ function () {
 _; _0 = 0; return [1, 0]
 },
 function () {
-_3 = _0 < a["length"]; if (!_3) return [1, 0]; _ = a[_0]; _3 = (true)
+_3 = _0 < a["length"]; if (!_3) return [1, 0]; _ = a[_0]; _3 = true
 },
 function () {
 if (!_3) return [2, 0]; return [_, 3]
@@ -362,7 +362,7 @@ function () {
 _0 = _2; _0 = _0["call"](b); _ = _0["next"](); return [1, 0]
 },
 function () {
-_2 = !_["done"]; if (!_2) return [1, 0]; a = _["value"]; _2 = (true)
+_2 = !_["done"]; if (!_2) return [1, 0]; a = _["value"]; _2 = true
 },
 function () {
 if (!_2) return [1, 0]; Symbol; _ = _0["next"](); return [-1, 0]
@@ -416,3 +416,11 @@ function () {
 _1 = getRequestProtocol(url); _0 = _1 + "//", location = _0 + location; return [1, 0]
 })
 var _0, _1 }`);
+assert(downLevel("var{a}=await b"), `return async_(
+function () {
+_0 = b; return [_0, 1]
+},
+function (_) {
+_0 = _; _0 = _0.a; a = _0
+})
+var a, _0`)

package/coms/compile/unstruct.js

@@ -403,14 +403,14 @@ var patchstep = function (r, nextindex, h) {
             x = rescan`if (${name}) return [${nextindex}, 0]`;
         }
         else if (o === RD) {
-            x = rescan`if (${name}!== null && ${name}!== undefined) return [${nextindex}, 0]`;
+            x = rescan`if (${name}!= null) return [${nextindex}, 0]`;
         }
         else continue;
         changed = true;
-        var p = o.prev;
+        var p = r[i - 1];
         if (!p || p.type === STAMP && p.text === ";");
         else x.unshift({ type: STAMP, text: ";" });
-        var n = o.next;
+        var n = r[i + 1];
         if (!n || n.type === STAMP && n.text === ';');
         else x.push({ type: STAMP, text: ';' });
         r.splice(i, 1, ...x);
@@ -504,6 +504,16 @@ var ispropcall = function (o) {
     if (o.type === SCOPED && o.entry === '[' && snapExpressHead(o) !== o) return true;
     return false;
 };
+var isAequalA = function (q) {
+    if (q.length < 3) return false;
+    if (!q.first) relink(q);
+    var f = q.first;
+    var t = q.last;
+    if (!f || !t || f.next !== t.prev) return false;
+    var m = f.next;
+    if (f.type !== EXPRESS || t.type !== EXPRESS || m.type !== STAMP) return false;
+    return f.text === t.text && m.text === '=';
+}
 var _invoke = function (t, getname) {
     var nameindex = 0;
     var getdeepname = function (deep = 0) {
@@ -531,9 +541,13 @@ var _invoke = function (t, getname) {
             continue;
         }
         if (needbreak(o)) {
+
             var s = splice(t, bx, cx + 1 - bx);
             if (cx > 0) s.name = [cloneNode(s[0])];
             else s.name = qname;
+            if (isAequalA(s.slice(0, s.length - 1))) {
+                s.splice(0, s.length - 1);
+            }
             queue.push(s);
             cx = bx - 1;
             bx = cx + 1;
@@ -591,8 +605,10 @@ var _invoke = function (t, getname) {
                 cache.push(...q);
                 nameindex++;
             }
+            if (iseval && o.entry === "(" && o.length === 1 && canbeOnce(o)) {
+                splice(t, cx, 1, o = o[0]);
+            }
             nameindex = _nameindex;
-            // if (!cache.length) continue;
             if (queue.length) flushqueue(result, queue), queue = [];
             if (cache.length) flushqueue(result, cache), cache = [];
             var n = o.next;
@@ -602,11 +618,18 @@ var _invoke = function (t, getname) {
                     var h = snapExpressHead(o);
                     var hx = t.lastIndexOf(h, cx);
                     var fs = splice(t, hx, cx + 1 - hx, { type: EXPRESS, text: getname(nameindex) });
-                    fs.unshift(...scanner2(`${getname(nameindex)}=`));
-                    relink(fs);
-                    fs.name = [{ text: getname(nameindex), type: EXPRESS }];
-                    pushstep(result, fs);
                     cx = hx - 1;
+                    a: {
+                        if (fs.length === 1 && canbeTemp(fs)) {
+                            if (fs[0].text === getname(nameindex)) {
+                                break a;
+                            }
+                        }
+                        fs.unshift(...scanner2(`${getname(nameindex)}=`));
+                        relink(fs);
+                        fs.name = [{ text: getname(nameindex), type: EXPRESS }];
+                        pushstep(result, fs);
+                    }
                 }
                 if (!lastlink) nameindex++;
             }
@@ -617,13 +640,15 @@ var _invoke = function (t, getname) {
         flushqueue(result, queue);
     }
     else if (t.length) {
-        var t0 = t[0];
-        if (t0.type === EXPRESS && /^[\.\[]/.test(t0.text) || t0.type & (STAMP | STRAP) && powermap[t0.text] < powermap.new) {
-            t.unshift(...rescan(`${qname}=${qname}`));
-            relink(t);
+        if (!isAequalA(t)) {
+            var t0 = t[0];
+            if (t0.type === EXPRESS && /^[\.\[]/.test(t0.text) || t0.type & (STAMP | STRAP) && powermap[t0.text] < powermap.new) {
+                t.unshift(...rescan(`${qname}=${qname}`));
+                relink(t);
+            }
+            t = uncurve(t);
+            pushstep(result, t);
         }
-        t = uncurve(t);
-        pushstep(result, t);
     }
     if (ret_) patchresult(result, 0);
     return result;
@@ -711,7 +736,10 @@ var popexp = function (explist) {
     return [asn, n];
 }
 var uncurve = function (c) {
-    if (c.length === 1 && c[0].type === SCOPED && c[0].entry === '(' && canbeOnce(c[0])) c = c[0];
+    if (c.length === 1) {
+        var c0 = c[0];
+        if (c0.type === SCOPED && c0.entry === '(' && canbeOnce(c0)) c = c0;
+    }
     return c;
 };
 var ternary = function (body, getname, ret) {

package/coms/compile/unstruct_test.js

@@ -68,7 +68,7 @@ test("for(;;)", "return [0, 0]", true);
 test("for(a in b)", "for (a in b)", true);
 test("for(a of b)", "for (a of b)", true);
 test("for await(a of b)", "for await (a of b)", true);
-test("for(a = os[Symbol.iterator] || os[Symbol.asyncIterator] || Array.prototype[Symbol.iterator], a = a.call(os), b = a.next(); !b.done && (o = b.value, true); b = a.next())", "_ = Symbol.iterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.asyncIterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.iterator; _ = Array.prototype[_];\r\n a = _; a = a.call(os); b = a.next(); return [1, 0];\r\n _ = !b.done; if (!_) return [1, 0]; o = b.value; _ = (true);\r\n if (!_) return [1, 0]; b = a.next(); return [-1, 0]", true);
+test("for(a = os[Symbol.iterator] || os[Symbol.asyncIterator] || Array.prototype[Symbol.iterator], a = a.call(os), b = a.next(); !b.done && (o = b.value, true); b = a.next())", "_ = Symbol.iterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.asyncIterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.iterator; _ = Array.prototype[_];\r\n a = _; a = a.call(os); b = a.next(); return [1, 0];\r\n _ = !b.done; if (!_) return [1, 0]; o = b.value; _ = true;\r\n if (!_) return [1, 0]; b = a.next(); return [-1, 0]", true);
 test("for(a=0;a<1;a++)if(a==0)continue\r\n else a=1", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [2, 0]; _ = a == 0; if (_) return [1, 0]; a = 1; return [1, 0];\r\n _ = a++; return [-1, 0]`, true);
 test("for(a=0;a<1;a++)if(a==0){continue} else {a=1}", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [3, 0]; _ = a == 0; if (!_) return [1, 0]; return [2, 0];\r\n a = 1; return [1, 0];\r\n _ = a++; return [-2, 0]`, true);
 test("for(a=0;a<1;a++){if(a==0){a=2;continue} else if(b) {a=1;continue} c=3}", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [4, 0]; _ = a == 0; if (!_) return [1, 0]; a = 2; return [3, 0];\r\n if (!b) return [1, 0]; a = 1; return [2, 0];\r\n c = 3; return [1, 0];\r\n _ = a++; return [-3, 0]`, true);
@@ -102,7 +102,7 @@ test("if(a) a = 1;function* a(){}", "a = function* a() {}; if (!a) return [1, 0]
 test("await new Promise(function(){})", '_ = function () {}; _ = new Promise(_); return [_, 1]', true);
 test(`onerror({ status: xhr.status, response: "Cookie解析异常!", toString: toResponse })`, '_ = { status: xhr.status, response: "Cookie解析异常!", toString: toResponse }; onerror(_)', true);
 test(`if (!/^https\\:\\/\\/|^s\\/\\//.test(url)) console.warn("请使用https访问如下路径:" + url)`, '_ = /^https\\:\\/\\/|^s\\/\\//.test(url); if (_) return [1, 0]; _ = "请使用https访问如下路径:" + url; _ = console.warn(_); return [1, 0]', true);
-test(`url += (/\\?/.test(url) ? "&" : "?") + datas;`, '_ = /\\?/.test(url); if (!_) return [1, 0]; _ = "&"; return [2, 0];\r\n _ = "?"; return [1, 0];\r\n _ = (_); _ = _ + datas; url = url + _', true);
+test(`url += (/\\?/.test(url) ? "&" : "?") + datas;`, '_ = /\\?/.test(url); if (!_) return [1, 0]; _ = "&"; return [2, 0];\r\n _ = "?"; return [1, 0];\r\n _ = _ + datas; url = url + _', true);
 test(`a = newname.querySelector("input,textarea").value = c.name.replace(/\\/$/, '')`, `_ = newname.querySelector("input,textarea"); _0 = c.name.replace(/\\/$/, ''); _.value = _0; a = _0`, true);
 test(`if (selected[f.url]) f.selected = true;`, `_ = f.url; _ = selected[_]; if (!_) return [1, 0]; f.selected = true; return [1, 0]`, true);
 test(`location.protocol  + parseURL(a.b).host `, `_ = a.b; _ = parseURL(_); location.protocol + _.host`, true);
@@ -132,7 +132,7 @@ test("predef[key[1]][key[2]][key[3]]", '_ = key[1]; _ = predef[_]; _0 = key[2];
 test("[key[1]][key[2]][key[3]]", '_ = key[1]; _ = [_]; _0 = key[2]; _ = _[_0]; _0 = key[3]; _[_0]');
 test("[key[1]][key[2]]+[key[3]][key[4]]", '_ = key[1]; _ = [_]; _0 = key[2]; _ = _[_0]; _0 = key[3]; _0 = [_0]; _1 = key[4]; _ + _0[_1]');
 test("if(a)a:{break a}", "if (!a) return [2, 0]; return [1, 0];\r\n return [1, 0]", true);
-test("rgb=(rgb<<8|rgb>>16)&0xffffff", "_ = rgb << 8, _0 = rgb >> 16, _ = _ | _0; _ = (_); rgb = _ & 0xffffff", true);
+test("rgb=(rgb<<8|rgb>>16)&0xffffff", "_ = rgb << 8, _0 = rgb >> 16, _ = _ | _0; rgb = _ & 0xffffff", true);
 test(`if (c) a; else return true; return false`, "if (!c) return [1, 0]; a; return [2, 0];\r\n return [true, 2];\r\n return [false, 2]")
 test(`switch(a){case a:a=a?1:0;break;case b:a=b;break;}`, "if (a === a) return [1, 0]; if (a === b) return [4, 0]; return [5, 0];\r\n if (!a) return [1, 0]; a = 1; return [2, 0];\r\n a = 0; return [1, 0];\r\n return [2, 0];\r\n a = b; return [1, 0]");
 test(`a=typeof a!==1`, "_ = typeof a, a = _ !== 1");
@@ -154,4 +154,4 @@ test(`do {var loadcount = 0;} while (loadcount !== 0);`, `loadcount = 0; _ = loa
 unstruct.debug = true; r++;
 test("if(a)try{a}catch{};a;", 'if (!a) return [4, 0]; return [1, 7];\r\n a; return [0, 9];\r\n return [1, 9];\r\n return [1, 0];\r\n a');
 test("url = (o===void 0||o===null?void 0:o.url)", '_ = void 0, _ = o === _; if (_) return [1, 0]; _ = o === null;\r\n if (!_) return [1, 0]; _ = void 0; return [2, 0];\r\n _ = o.url; return [1, 0];\r\n url = _', true);
-test("p ? (ishttps ? `https` : `http`).toUpperCase() + i18n`端口` + (ishttps ? ': ' : ':  ') + p : ''","if (!p) return [1, 0]; if (!ishttps) return [1, 0]; _0 = `https`; return [2, 0];\r\n _0 = `http`; return [1, 0];\r\n _0 = (_0); _1 = _0.toUpperCase(); _ = _1 + i18n`端口`; if (!ishttps) return [1, 0]; _2 = ': '; return [2, 0];\r\n _2 = ':  '; return [1, 0];\r\n _ = _ + (_2), _ = _ + p; return [2, 0];\r\n ''; return [1, 0]")
+test("p ? (ishttps ? `https` : `http`).toUpperCase() + i18n`端口` + (ishttps ? ': ' : ':  ') + p : ''","if (!p) return [1, 0]; if (!ishttps) return [1, 0]; _0 = `https`; return [2, 0];\r\n _0 = `http`; return [1, 0];\r\n _1 = _0.toUpperCase(); _ = _1 + i18n`端口`; if (!ishttps) return [1, 0]; _2 = ': '; return [2, 0];\r\n _2 = ':  '; return [1, 0];\r\n _ = _ + _2, _ = _ + p; return [2, 0];\r\n ''; return [1, 0]")

package/coms/pivot/acme2.js

@@ -211,7 +211,7 @@ var acme2 = new class {
             acme2.domain = extra.domain;
             acme2.termsOfServiceAgreed = extra.termsOfServiceAgreed;
             acme2.orders = extra.orders;
-            acme2.lastUpdateTime = parseDate(extra.lastUpdateTime);
+            acme2.lastUpdateTime = filterTime(extra.lastUpdateTime, "y-MM-dd hh:mm");
             acme2.nextUpdateTime = parseDate(extra.nextUpdateTime);
             acme2.schadulePeriod = +extra.schadulePeriod || 80;
             acme2.schaduleEnabled = extra.schaduleEnabled;
@@ -351,12 +351,13 @@ var acme2 = new class {
         upload(o, { oid: o.oid, private: kp[0], public: kp[1] });
         return o;
     }
-    async autoUpdate(domain, setauth, upload) {
+    async autoUpdate(saveUnique, domain, setauth, upload) {
         if (!domain.length) return;
         if (acme2.orders.length >= 20) acme2.orders.pop();
         this.lastUpdateTime = parseDate(Date.now());
         this.updateTime();
         var o = await acme2.newOrder({ domain });
+        await saveUnique();// 及时保存订单信息以便后续查看
         o = await acme2.getOrder(o);
         if (o.status === 'pending') {
             o = await acme2.auditOrder(o, setauth);

package/docs//345/267/245/345/205/267//345/233/275/351/231/205/345/214/226.xht

@@ -46,6 +46,10 @@
             width: 100%;
             height: 36px;
         }
+        &:last-child {
+            float: left;
+        }
+
 
         @media (min-width:800px) {
             float: right;
@@ -420,7 +424,6 @@
         if (searchText) filtedData.search(searchText, function () {
             render.digest();
         });
-        console.log(filtedData)
     };
     var detailWindow;
     var detailScope = {

package/package.json

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