efront 4.4.13 → 4.5.0

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

@@ -1,3 +1,51 @@
+- zh-CN: 请求无效!
+  en:    Request is invalid!
+
+- zh-CN: 已取消
+  en:    Canceled
+
+- zh-CN: 输入原密码：
+  en:    "Enter the original password:"
+
+- zh-CN: 数据过载..
+  en:    Data overload..
+
+- zh-CN: 服务器忙！
+  en:    Server busy!
+
+- zh-CN: 无权访问
+  en:    Unauthorized access
+
+- zh-CN: 清理完成
+  en:    Cleaning completed
+
+- zh-CN: 正在重启
+  en:    Restarting
+
+- zh-CN: 已存在相同标识的数据
+  en:    Data with the same identifier already exists
+
+- zh-CN: 禁止访问
+  en:    Prohibit access
+
+- zh-CN: 已关闭$1端口
+  en:    $1 port has been closed
+
+- zh-CN: <red>端口异常</red>
+  en:    <red>Port exception</red>
+
+- zh-CN: filelist
+  en:    filelist
+
+- zh-CN: pathlist
+  en:    pathlist
+
+- zh-CN: pathend
+  en:    pathend
+
+- zh-CN: 邮箱
+  en:    mailbox
+
 - zh-CN: 过滤空串
   en:    Filter empty strings
 
@@ -5,10 +53,10 @@
   en:    ","
 
 - zh-CN: ，
-  en:    "."
+  en:    .
 
 - zh-CN: ！
-  en:    ","
+  en:    !
 
 - zh-CN: https://letsencrypt.org/zh-cn/
   en:    
@@ -260,7 +308,7 @@
   en:    Server restart
 
 - zh-CN: 正在退出..
-  en:    Exiting
+  en:    Exiting..
 
 - zh-CN: 进程已退出
   en:    Process has exited
@@ -401,7 +449,7 @@
   en:    Not supported
 
 - zh-CN: 当前运行环境使用class extends Array会有难以解决的不兼容性问题，请更换代码的实现方式！
-  en:    
+  en:    The current operating environment using class extends Array may have compatibility issues that are difficult to solve. Please change the implementation method of the code!
 
 - zh-CN: 代码异常！
   en:    Code exception!
@@ -719,7 +767,7 @@
   en:    The path does not point to file $1
 
 - zh-CN: 文件过大!$1
-  en:    The file is too large$ one
+  en:    The file is too large! $1
 
 - zh-CN: 读取文件信息出错$1
   en:    Error reading file information $1
@@ -1448,7 +1496,7 @@
   en:    "Other environmental variables are as follows:"
 
 - zh-CN: 不支持该命令<red2> $1 </red2>
-  en:    The command is not supported<red2>$1</red2>
+  en:    The command <red2>$1</red2> is not supported
 
 - zh-CN: 如下命令与您输入的命令相似：
   en:    "The following command is similar to the one you entered:"

package/apps/pivot/api.yml

@@ -18,6 +18,9 @@
   room: options ::link-:id
   care: options ::care-:id
   cast: options ::cast-:id?:msg
+  setauth|: options ::setauth-/.well-known/acme-challenge/:token?:token.:thumb
+  unique: options ::unique
+  unique-save: options ::unique-:data
   upload: put :path
 https://www.ip.cn/:
   iplocation: get https://www.ip.cn/api/index?ip=:ip&type=1

package/apps/pivot/cert/main.xht

@@ -0,0 +1,181 @@
+<style>
+    a {
+        text-decoration: none;
+    }
+
+    * {
+        box-sizing: border-box;
+    }
+
+
+    form {
+        display: block;
+        max-height: 100%;
+        width: 100%;
+
+        >[body] {
+            height: auto;
+            height: 100%;
+            overflow-x: hidden;
+            overflow-y: scroll;
+        }
+    }
+
+    :root {
+        height: 100%;
+        overflow: auto;
+    }
+
+    [type=function] {
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        text-overflow: ellipsis;
+        overflow: hidden;
+    }
+
+    [info] {
+        text-align: center;
+        background: #ffe;
+        padding: 2px 20px;
+        font-size: 14px;
+    }
+
+    [body] {
+        appearance: none;
+        border: none;
+    }
+</style>
+<div -if="!enabled">
+    请在支持window.crypto.subtle的浏览器上使用此页面的功能
+</div>
+<form on-submit="nosubmit" #box>
+    <xmenu head #menubar -src="(m,i) in menus" @active="activeMenu(m,i)"></xmenu>
+    <div body #body>
+        <div info>${i18n`本页使用的证书服务来自`}<a target="_blank" href="${i18n`https://letsencrypt.org/zh-cn/`}">Let's
+                Encrypt</a>
+        </div>
+        <field -repeat="s in actived.fields" -src="[s,formdata]"></field>
+        <container -if="actived.src" _src="actived.src" _params="actived.params">
+        </container>
+    </div>
+    <scrollbar y #bar></scrollbar>
+    <div foot>
+        <span -bind="actived.message"></span>
+        <button -repeat="(f,k) in actived.actions" -click="f(actived)"><span -bind="k"></span></button>
+    </div>
+</form>
+<script>
+    var subtle = window.crypto?.subtle;
+    var enabled = acme2.enabled;
+    if (!enabled) return;
+    var form = view;
+    var activeIndex = 0;
+    var nosubmit = e => e.preventDefault();
+    var directory;
+    var formdata = {};
+    var private_key, public_key;
+    var unique;
+    var loadUnique = async function () {
+        unique = await data.from("unique");
+        await acme2.makeUnique(unique);
+        if (acme2.orders?.length) activeMenu(menus[2], 2);
+        else if (acme2.kid) activeMenu(menus[1], 1);
+        extend(formdata, acme2);
+    };
+    var publicKey, privateKey;
+    loadUnique().then(render.digest).then(lazy(function () {
+        box.reshape();
+        bar.reshape();
+    }));
+    var a = button;
+    var xmenu = menu;
+    var that = this;
+
+    var saveUnique = async function (params) {
+        extendIfOccurs(acme2, params);
+        var extra = acme2.pickUnique();
+        await data.from("unique-save", { data: extra });
+    };
+    var openOrder = async function (event, href) {
+        event.preventDefault();
+    }
+    var menus = [
+        {
+            "name": "创建账户",
+            fields: refilm`
+            $公钥/public_key/单击生成 ${function (elem) {
+                    var { data, field } = elem;
+                    elem.innerHTML = `<a @click="gen()" -if="!data[field.key]">单击生成</a><span -else -bind="data[field.key]"></span>`;
+                    render(elem, {
+                        data, field, async gen() {
+                            await acme2.initUnique();
+                            formdata.public_key = acme2.public_key;
+                            await saveUnique();
+                        }
+                    })
+                }} 
+            *邮箱/email email
+            /termsOfServiceAgreed/同意 checker ${{
+                    async"《服务条款》"(data) {
+                        var termsOfService = await acme2.getTermsOfService();
+                        if (termsOfService) window.open(termsOfService, "_blank", "popup,noopener,noreferer")
+                    },
+                }}
+            `,
+            get message() {
+                return formdata.kid ? "已创建账户" : '';
+            },
+            actions: {
+                async 创建账户(actived) {
+                    var params = submit(actived.fields, formdata);
+                    await saveUnique(params);
+                    formdata.kid = await acme2.newAccount(params);
+                    await saveUnique();
+                }
+            }
+        },
+        {
+            "name": "创建订单",
+            get disabled() {
+                return !!formdata.kid;
+            },
+            fields: refilm`
+            $账户/kid input
+            *当前服务器的域名/domain/每行一个 text
+            `,
+            actions: {
+                async 创建订单(actived) {
+                    var params = submit(actived.fields, formdata);
+                    var order = await acme2.newOrder(params);
+                    formdata.orders = acme2.orders;
+                    await saveUnique();
+                    activeMenu(menus[2], 2);
+                }
+            }
+        },
+        {
+            name: "订单信息",
+            src: '/cert/orders',
+            get params() {
+                return formdata.orders;
+            }
+        }
+    ];
+
+    var actived = null;
+    var activeMenu = function (m, i) {
+        if (actived === m) return;
+        if (actived) actived.actived = false;
+        m.actived = true;
+        actived = m;
+        activeIndex = i;
+    };
+    activeMenu(menus[0], 0);
+    var normalList = plist.bind(null, '接口管理', "cert", refilm`
+            * 域名 / hostname input / 190
+    更新连接 / url text / 290
+    密码 / password input / 290
+        `, '/cert/edit');
+
+</script>

package/apps/pivot/cert/orders.xht

@@ -0,0 +1,144 @@
+<style>
+    &>list,
+    &>div {
+        display: inline-block;
+    }
+
+    & {
+        --border: 1px solid #0006;
+    }
+
+    &>xmenu[horizonal] {
+        width: 100%;
+        margin-bottom: -2px;
+        z-index: 1;
+        border-bottom: none;
+        box-shadow: none;
+
+        &:after {
+            content: "";
+            display: block;
+            position: absolute;
+            left: 0;
+            bottom: 0;
+            right: 0;
+            height: 0;
+            border-bottom: --border;
+            z-index: -1;
+        }
+
+        .actived {
+            background: #fff;
+            color: #333;
+            border: --border;
+            border-bottom: none;
+        }
+
+        +form {
+            border: --border;
+            background: #fff;
+        }
+    }
+
+    [actived] {
+        background: #fff;
+        /* border-bottom: 2px solid; */
+    }
+
+    [status]>s {
+        width: 0;
+        height: 0;
+        border-radius: 50%;
+        display: inline-block;
+        border: .3em solid;
+        margin-right: 6px;
+    }
+
+    @status(@s, @c) {
+        [status=@s] {
+            color: @c;
+        }
+    }
+
+    @status(pending, #777);
+    @status(processing, #f82);
+    @status(ready, #284);
+    @status(valid, #26c);
+    @status(invalid, #c24);
+</style>
+<xmenu -src="o of orders" @active="openOrder(o)"></xmenu>
+<form -if="order?.oid" onsubmit="event.preventDefault()">
+    <div body>
+        <field -repeat="f in fields" _src="[f,order]"></field>
+    </div>
+    <div foot>
+        <button -if="order.authorizations?.length" @click="auditOrder(order)">提审</button>
+        <button -if="order.finalize">定案</button>
+    </div>
+</form>
+<script>
+    var fields = refilm`
+    $状态/status radio [待定/pending,完毕/ready,审核中/processing,生效/valid,无效/invalid]
+    $证书/certificate anchor
+    $域名/identifiers ${function (elem) {
+            var { field, data } = elem;
+            var value = data[field.key];
+            if (value instanceof Array) elem.innerHTML = value.map(v => `${v.value} (${v.type})`).join("<br/>")
+            else elem.innerHTML = '';
+        }}
+    $失效时间/expires ${function (elem) {
+            var { field, data } = elem;
+            elem.innerHTML = filterTime(data[field.key]);
+        }}
+    `;
+    var order = {
+        authorizations: [],
+        expires: NaN,
+        finalize: '',
+        identifiers: [],
+        status: ''
+    };
+
+    function main(params) {
+        var orders = params || [];
+        orders = orders.map(acme2.parseOrder);
+        orders[0].actived = true;
+        var page = document.createElement('orders');
+        page.innerHTML = template;
+        var scope = {
+            fields,
+            form: view,
+            xmenu: menu,
+            orders,
+            order: null,
+            async openOrder(o) {
+                this.order = o;
+                if (!o.oid) return;
+                var order = await acme2.getOrder(orders[0]);
+                extend(o, order);
+                if (o !== this.order) return;
+                this.order = shallowClone(o);
+            },
+            async auditOrder(o) {
+                a: for (var a of o.authorizations) {
+                    var o = await acme2.audit(a);
+                    if (o.challenges) {
+                        for (var c of o.challenges) {
+                            if (c.type === 'http-01') {
+                                await data.from("setauth", { token: c.token, thumb: await acme2.thumbprint() });
+                                await data.fromURL(c.url);
+                                continue a;
+                            }
+                        }
+                    }
+                    alert("无法找到可用的提审方案" + o.identifier?.value, 'warn');
+                }
+                await this.openOrder(this.order);
+            }
+        }
+        renderWithDefaults(page, scope);
+        if (orders.length) scope.openOrder(orders[0]).then(render.digest);
+
+        return page;
+    }
+</script>

package/apps/pivot/menu.yml

@@ -4,6 +4,7 @@ WEB:
   文件管理: /wow/root
   长连接管理: /link/index
   字典: /dict/list
+  证书管理: /cert/main
   共享目录: /share/list
 服务:
   密钥管理: /token/list

package/coms/basic/assert.js

@@ -1,18 +1,42 @@
 var mark = require("./mark");
-if (console.format) {
-    var gray = console.format('<gray>;</gray>').split(';');
-    var green = console.format('<green>;</green>').split(';');
-    var crack = console.format('<red2>;</red2>').split(';');
-}
-else {
-    var gray = [, ,];
-    var green = [, ,];
-    var crack = [, ,];
-}
+var format = console.format, clog = console.log;
+if (!format) format = a => a, clog = function () {
+    var args = [];
+    var colors = {
+        green: 'color:green;',
+        gray: "color:gray;",
+        red2: "color:red;",
+        bgblue: 'background-color:blue;',
+        bgred: 'background-color:red;',
+        cyan: 'color:#29c;',
+        reset: 'color:;background-color:;',
+    }
+    for (var a of arguments) {
+        if (typeof a === "string") {
+            var tags = [];
+            a = renderTags(a, function (tag, e) {
+                var c = tag ? colors[tag] : colors.reset;
+                if (c) {
+                    if (e !== false) tags.push(c);
+                    return '%c'
+                }
+                return '';
+            });
+            args.push(a, ...tags);
+        }
+        else args.push(a);
+    }
+    console.log(...args);
+};
+
+
+var gray = format('<gray>;</gray>').split(';');
+var green = format('<green>;</green>').split(';');
+var crack = format('<red2>;</red2>').split(';');
 var dump = function (a, msg) {
-    if (a instanceof Object) console.error(i18n`属性错误`), console.log(msg ? msg + " " : "  {\r\n", Object.keys(a).map(k => `  ${k}${gray.join(':')}\r\n      ${a[k]}`).join('\r\n') + "\r\n }");
-    else if (msg) console.log(msg + ":", a);
-    else console.log(a);
+    if (a instanceof Object) console.error(i18n`属性错误`), clog(msg ? msg + " " : "  {\r\n", Object.keys(a).map(k => `  ${k}${gray.join(':')}\r\n      ${a[k]}`).join('\r\n') + "\r\n }");
+    else if (msg) clog(msg + ":", a);
+    else clog(a);
 };
 var colorString = function (s, color1, e, color2) {
     s = String(s);
@@ -35,9 +59,9 @@ var assert = function (result, expect, log = dump) {
             errors = `结果 (${args}) 应为 ${JSON.stringify(k)}`;
         }
         if (k === undefined) return function () {
-            var color1 = console.format("<bgred>; </bgred>").split(";");
-            var color2 = console.format("<bgblue>; </bgblue>").split(";");
-            var color3 = console.format("<cyan>;</cyan>").split(";");
+            var color1 = format("<bgred>; </bgred>").split(";");
+            var color2 = format("<bgblue>; </bgblue>").split(";");
+            var color3 = format("<cyan>;</cyan>").split(";");
             mark.setTag1(color1[1], color1[0]);
             mark.setTag2(color2[1], color2[0]);
             var [r, e] = mark.pair(result, expect);

package/coms/basic/cross_.js

@@ -20,7 +20,7 @@ var setHost = function (host) {
     base = host;
     encrypt = null;
 };
-var HeadersKeys = ["Content-Type"];
+var RealHeadersKeys = { "content-type": "Content-Type" };
 var cors_hosts = [];
 function getDomainPath(url) {
     return url.replace(domainReg, "$2/$3");
@@ -330,7 +330,18 @@ function cross_(jsonp, digest = noop, method, url, headers) {
             }
             else if (cachedata.length && isEmpty(datas)) {
                 var jsondata = mergedata(cachedata, parseKV);
-                if (isform) {
+                if (realHeaders["Content-Type"]) {
+                    if (/json$/i.test(realHeaders["Content-Type"])) {
+                        datas = JSON.stringify(jsondata);
+                    }
+                    else {
+                        if (hasFile(jsondata)) {
+                            datas = kv2form(jsondata);
+                        }
+                        else datas = serialize(jsondata, '&', "=");
+                    }
+                }
+                else if (isform) {
                     var hasfile = hasFile(jsondata);
                     if (hasfile) {
                         datas = kv2form(jsondata);
@@ -383,7 +394,13 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                 }
             }
             else {
-                _headers[k] = headers[k];
+                var k1 = RealHeadersKeys[k.toLowerCase()];
+                if (k1) {
+                    realHeaders[k1] = headers[k];
+                }
+                else {
+                    _headers[k] = headers[k];
+                }
             }
         }
     };

package/coms/basic/i18n.md

@@ -1,10 +1,12 @@
 国际化工具的时的语法如下：
 ```javascript
-    i18n`中文内容${参数}`//参数中不能有执行体，否则可能被执行多次造成异常
+    i18n`中文内容${参数}`
 ```
 在项目目录存在指定的国际化文件时，efront会自动转换为类似如下版本，具体语言语种及内容以国际化文件为主：
 
 ```javascript
-    i18n(`中文内容${参数}`,`English Content${参数}`)
+    i18n(`中文内容${参数}`,`English Content${参数}`);
+    // 如果参数中有破坏型的执行体，将转换为如下形式来保证参数中的代码只执行一次
+    i18n(()=>`中文内容${参数}`,()=>`English Content${参数}`)()
 ```
 国际化文件可以在文档国际化工具中扫描生成。

package/coms/basic/renderTags.js

@@ -0,0 +1,23 @@
+var tagReg = /<(\/?)([a-z][\w]*)\>/ig;
+// 只应用一种效果，多种效果不能同时存在
+function renderTags(str, getTag) {
+    var tagpath = [];
+    return String(str).replace(tagReg, function (_, e, c) {
+        if (!c || c.length < 3) return _;
+        var t = getTag(c, false);
+        if (!t) return _;
+        if (e) {
+            tagpath.pop();
+            c = tagpath[tagpath.length - 1];
+        }
+        else tagpath.push(c);
+        var res = [];
+        if (e) res.push(getTag());
+        if (c) res.push(getTag(c));
+        if (res.length) return res.join('');
+        return _;
+    });
+
+}
+renderTags.reg = tagReg;
+module.exports = renderTags;

package/coms/basic/shallowClone.js

@@ -0,0 +1,8 @@
+var shallowClone = function (origin, deep) {
+    if (--deep < 0) return origin;
+    if (!isObject(origin)) return origin;
+    var temp = origin instanceof Array ? [] : {};
+    if (deep > 0) for (var k in origin) temp[k] = shallowClone(origin[k], deep);
+    else for (var k in origin) temp[k] = origin[k];
+    return temp;
+}

package/coms/basic/shallowEqual.js

@@ -1,18 +1,27 @@
 var singleEqual = isSame;
-function shallowEqual(o1, o2) {
+function shallowEqual(o1, o2, deep) {
     // 浅层比对，对内层对象不进行递归比对
-    if (o1 === o2) return true;
+    if (--deep < 0) return singleEqual(o1, o2);
+    if (singleEqual(o1, o2)) return true;
     if (isObject(o1) && isObject(o2)) {
         var keys1 = Object.keys(o1), keys2 = Object.keys(o2);
         if (keys1.length !== keys2.length) return false;
         keys1.sort(), keys2.sort();
+        var rest = [];
         for (var cx = 0, dx = keys1.length; cx < dx; cx++) {
             var key1 = keys1[cx];
             var key2 = keys2[cx];
             if (key1 !== key2) return false;
-            if (!singleEqual(o1[key1], o2[key2])) return false;
+            var v1 = o1[key1], v2 = o2[key2];
+            if (!singleEqual(v1, v2)) {
+                if (deep) rest.push(v1, v2);
+                else return false;
+            }
+        }
+        if (deep > 0) for (var cx = 0, dx = rest.length; cx < dx;) {
+            if (!shallowEqual(rest[cx++], rest[cx++], deep)) return false;
         }
         return true;
     }
-    return singleEqual(o1, o2);
+    return false;
 }

package/coms/basic/valid.js

@@ -1,3 +1,11 @@
+var validators = {
+    email(text) {
+        var i = text.indexOf('@');
+        if (i < 0) return i18n`电子邮箱地址应包含符号“@”`;
+        if (i === 0) return i18n`@符号前应有内容`;
+        if (i === text.length - 1) return i18n`@符号后应有内容`;
+    }
+}
 function valid(field, data) {
     var error;
     if (isEmpty(data[field.key])) {
@@ -6,8 +14,13 @@ function valid(field, data) {
         }
         return;
     }
-    var tmp;
-    if (tmp = /\:(\d+)(?:\.(\d+))?$/.exec(field.type)) {
+    var tmp = validators[field.type];
+    if (tmp) {
+        var value = data[field.key];
+        var error = tmp(String(value ?? ''));
+        if (error) return error;
+    }
+    else if (tmp = /\:(\d+)(?:\.(\d+))?$/.exec(field.type)) {
         var [, a, b] = tmp;
         var value = data[field.key];
         a = +a;