efront 4.5.0 → 4.5.4

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

@@ -1,3 +1,33 @@
+- zh-CN: 端口异常
+  en:    Port abnormality
+
+- zh-CN: 分配地址失败
+  en:    Address allocation failed
+
+- zh-CN: 电子邮箱地址应包含符号“@”
+  en:    "The email address should contain the symbol \"@\""
+
+- zh-CN: "@符号前应有内容"
+  en:    "There should be content before the symbol \"@\""
+
+- zh-CN: "@符号后应有内容"
+  en:    "There should be content after the symbol\"@\""
+
+- zh-CN: 私钥
+  en:    Private key
+
+- zh-CN: 证书
+  en:    certificate
+
+- zh-CN: 账户
+  en:    account
+
+- zh-CN: 当前服务器的域名
+  en:    The domain name of the current server
+
+- zh-CN: 订单失效时间
+  en:    Order expiration time
+
 - zh-CN: 请求无效!
   en:    Request is invalid!
 

package/apps/pivot/api.yml

@@ -21,6 +21,7 @@
   setauth|: options ::setauth-/.well-known/acme-challenge/:token?:token.:thumb
   unique: options ::unique
   unique-save: options ::unique-:data
+  recert: options ::recert
   upload: put :path
 https://www.ip.cn/:
   iplocation: get https://www.ip.cn/api/index?ip=:ip&type=1

package/apps/pivot/cert/edit.js

@@ -0,0 +1 @@
+pedit.bind(null, "证书", "cert");

package/apps/pivot/cert/list.js

@@ -0,0 +1,9 @@
+plist.bind(null, '接口管理', "cert", refilm`
+*域名/hostname input/253
+公钥/private gen/600 ${async function (data) {
+        var [private_key, public_key] = await acme2.createKeyPair();
+        data.private = private_key;
+        data.public = public_key;
+    }}
+-私钥/public text
+$证书/cert text`, '/cert/edit');

package/apps/pivot/cert/main.xht

@@ -46,10 +46,8 @@
         border: none;
     }
 </style>
-<div -if="!enabled">
-    请在支持window.crypto.subtle的浏览器上使用此页面的功能
-</div>
-<form on-submit="nosubmit" #box>
+<div -if="!enabled"></div>
+<form on-submit="nosubmit" renderid=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
@@ -66,9 +64,8 @@
     </div>
 </form>
 <script>
-    var subtle = window.crypto?.subtle;
     var enabled = acme2.enabled;
-    if (!enabled) return;
+    if (!enabled) return ["请在支持window.crypto.subtle的浏览器上使用此页面的功能"];
     var form = view;
     var activeIndex = 0;
     var nosubmit = e => e.preventDefault();
@@ -79,14 +76,20 @@
     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);
+        if (menuIndex === 0) {
+            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 () {
+    loadUnique().then(render.digest).then(lazy(async function () {
         box.reshape();
         bar.reshape();
+        var certlist = await plist.load('cert');
+        formdata.domain = certlist.map(c => c.hostname).join("\r\n");
+        render.digest();
     }));
     var a = button;
     var xmenu = menu;
@@ -114,7 +117,7 @@
                             await saveUnique();
                         }
                     })
-                }} 
+                }}
             *邮箱/email email
             /termsOfServiceAgreed/同意 checker ${{
                     async"《服务条款》"(data) {
@@ -148,7 +151,6 @@
                 async 创建订单(actived) {
                     var params = submit(actived.fields, formdata);
                     var order = await acme2.newOrder(params);
-                    formdata.orders = acme2.orders;
                     await saveUnique();
                     activeMenu(menus[2], 2);
                 }
@@ -158,8 +160,16 @@
             name: "订单信息",
             src: '/cert/orders',
             get params() {
-                return formdata.orders;
+                return { orders: acme2.orders, saveUnique };
             }
+        },
+        {
+            name: "证书列表",
+            src: "/cert/list",
+        },
+        {
+            name: "更新服务",
+            src: "/cert/update",
         }
     ];
 
@@ -170,12 +180,9 @@
         m.actived = true;
         actived = m;
         activeIndex = i;
+        state({ index: i })
     };
-    activeMenu(menus[0], 0);
-    var normalList = plist.bind(null, '接口管理', "cert", refilm`
-            * 域名 / hostname input / 190
-    更新连接 / url text / 290
-    密码 / password input / 290
-        `, '/cert/edit');
+    var menuIndex = state().index || 0;
+    activeMenu(menus[menuIndex], menuIndex);
 
 </script>

package/apps/pivot/cert/orders.xht

@@ -10,22 +10,11 @@
 
     &>xmenu[horizonal] {
         width: 100%;
-        margin-bottom: -2px;
+        margin-bottom: -1px;
         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;
-        }
+        background: none;
 
         .actived {
             background: #fff;
@@ -67,26 +56,36 @@
     @status(invalid, #c24);
 </style>
 <xmenu -src="o of orders" @active="openOrder(o)"></xmenu>
-<form -if="order?.oid" onsubmit="event.preventDefault()">
+<div -if="!order">
+    暂无订单
+</div>
+<form -elseif="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>
+        <button -if="order?.removable" class="danger" confirm @click="dropOrder(order)">删除订单</button>
+        <button -if="order.status==='processing'" @click="openOrder(order)">刷新</button>
+        <button -if="order.status==='pending'" @click="auditOrder(order)">提交审核</button>
+        <button -if="order.status==='ready'" @click="finalize(order)">请求证书</button>
+        <button -if="order.status==='valid'" @click="see(order)">查看证书</button>
+        <button -if="order.shouldupload" @click="upload(order)">上传到服务器</button>
     </div>
 </form>
+<div -else>
+    订单异常
+</div>
 <script>
     var fields = refilm`
-    $状态/status radio [待定/pending,完毕/ready,审核中/processing,生效/valid,无效/invalid]
-    $证书/certificate anchor
+    $状态/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) {
+    $订单失效时间/expires ${function (elem) {
             var { field, data } = elem;
             elem.innerHTML = filterTime(data[field.key]);
         }}
@@ -100,9 +99,9 @@
     };
 
     function main(params) {
-        var orders = params || [];
+        var { orders = [], saveUnique } = params;
         orders = orders.map(acme2.parseOrder);
-        orders[0].actived = true;
+        if (orders.length) orders[0].actived = true;
         var page = document.createElement('orders');
         page.innerHTML = template;
         var scope = {
@@ -112,28 +111,106 @@
             orders,
             order: null,
             async openOrder(o) {
-                this.order = o;
-                if (!o.oid) return;
-                var order = await acme2.getOrder(orders[0]);
+                o = this.order = shallowClone(o);
+                if (!o || !o.oid) return;
+                var order = await acme2.getOrder(o);
                 extend(o, order);
                 if (o !== this.order) return;
+                if (o.certificate && !o.shouldupload) {
+                    var identifiers = o.identifiers;
+                    var d = await pedit.query("cert", identifiers[identifiers.length - 1].value);
+                    if (d && d.oid === o.oid && !d.cert) {
+                        o.shouldupload = true;
+                    }
+                    else {
+                        o.removable = true;
+                    }
+                }
+                if (o.status === 'invalid') {
+                    o.removable = true;
+                }
+                else {
+                    if (o.certificate && +o.expires < Date.now()) {
+                        o.removable = true;
+                    }
+                }
                 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) {
+                    var b = await acme2.audit(a);
+                    if (b.challenges) {
+                        for (var c of b.challenges) {
                             if (c.type === 'http-01') {
+                                if (c.status !== 'pending') continue a;
                                 await data.from("setauth", { token: c.token, thumb: await acme2.thumbprint() });
-                                await data.fromURL(c.url);
+                                await acme2.requestURL(c.url, {});
                                 continue a;
                             }
                         }
                     }
-                    alert("无法找到可用的提审方案" + o.identifier?.value, 'warn');
+                    alert("无法找到可用的提审方案" + b.identifier?.value, 'warn');
+                }
+                await wait(600);
+                if (this.order === o) await this.openOrder(this.order);
+            },
+            async finalize(o) {
+                var domains = o.identifiers.map(d => d.value);
+                var kp = await acme2.createKeyPair();
+                var csr = await acme2.createCSR(domains, kp[0]);
+                var order = await acme2.requestURL(o.finalize, { csr });
+                order = extend({}, o, order);
+                if (o === this.order) o = this.order = order;
+                render.digest();
+                await wait(600);
+                var order = await acme2.getOrder(o);
+                var cert = order.certificate;
+                if (!cert) {
+                    order.shouldupload = true;
+                }
+                else {
+                    cert = await data.fromURL(cert);
+                }
+                for (var d of domains) {
+                    pedit.update("cert", d, { hostname: d, private: kp[0], public: kp[1], cert, oid: o.oid })
+                }
+                if (this.order === o) this.order = extend({}, o, order);
+            },
+            async dropOrder(o) {
+                for (var cx = 0, dx = orders.length; cx < dx; cx++) {
+                    if (orders[cx].oid === o.oid) break;
+                };
+                if (cx < 0) return;
+                orders.splice(cx, 1);
+                acme2.orders.splice(cx, 1);
+                if (cx >= orders.length) cx = orders.length - 1;
+                await saveUnique();
+                this.openOrder(orders[cx]);
+            },
+            async see(o) {
+                var content = `<div head>${o.identifiers.map(d => d.value).join(', ')}<close @click=remove()></close></div><loading -if='cert.loading'></loading><div body style='font-size:10px;font-family:Consolas, "Courier New", monospace;white-space:pre;' -bind='cert.data'></div><scrollbar y></scrollbar>`;
+                var e = view();
+                css(e, 'position:absolute;width:366px;');
+                e.innerHTML = content;
+                drag.on(e.firstElementChild, e);
+                resize.on(e);
+                renderWithDefaults(e, {
+                    cert: data.fromURL(o.certificate),
+                    scrollbar,
+                    remove() {
+                        remove(e);
+                    }
+                })
+                popup(e);
+                move.setPosition(e, [.5, .5]);
+            },
+            async upload(o) {
+                var cert = await data.fromURL(o.certificate);
+                for (var d of o.identifiers) {
+                    await pedit.merge("cert", d.value, { cert });
                 }
-                await this.openOrder(this.order);
+                o.shouldupload = false;
+                o.removable = true;
             }
         }
         renderWithDefaults(page, scope);

package/apps/pivot/cert/update.xht

@@ -0,0 +1,7 @@
+<div><button @click="updateCert()">更新证书</button></div>
+<script>
+    var updateCert = async function () {
+        await data.from("recert");
+        alert("更新完成！", 'success');
+    };
+</script>

package/coms/basic/cross_.js

@@ -154,8 +154,9 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         if (e.type === 'error') {
             e = createResponse("无法访问服务器！");
         }
+        headers = extend({}, _headers);
         for (var r of reforms) {
-            var r = await reform.call(xhr, r, { method, url, status: xhr.status, headers: _headers }, fire, onerror1, e);
+            var r = await reform.call(xhr, r, { method, url, status: xhr.status, headers }, fire, onerror1, e);
             if (r === false) {
                 return;
             }

package/coms/basic/valid.js

@@ -45,8 +45,10 @@ function valid(field, data) {
         if (e) return e;
     }
     if (field.options instanceof Function) {
-        var e = field.options(data[field.key]);
-        if (e) return e;
+        if (/^(input|text|html|password|raw)/.test(field.type)) {
+            var e = field.options(data[field.key]);
+            if (e) return e;
+        }
     }
     return error;
 }

package/coms/compile/Javascript.js

@@ -514,6 +514,11 @@ Javascript.prototype.detour = function (o, ie) {
     context = null;
     return envs;
 }
+var getfunc = function (o, k) {
+    var q = o.queue;
+    while (q && (!q.scoped || !q.scoped.used[k])) q = q.queue;
+    return q;
+};
 var context = null, rootenvs = null;
 function detour(o, ie) {
     while (o) {
@@ -528,21 +533,30 @@ function detour(o, ie) {
                     var m = /^[^\.\[\]]+/.exec(o.text);
                     if (m) { context.avoidMap[m[0]] = true; }
                 }
-                if (/\?\./.test(text)) {
-                    if (/\?\.$/.test(text)) {
-                        o = snapExpressHead(o);
-                        var f = snapExpressFoot(o);
-                        var rest = [o];
-                        remove(o, f.prev);
-                        while (o !== f) {
-                            o = o.next;
-                            rest.push(o);
-                        }
-                        text = createString(rest);
+                if (/\?\.|\?\?/.test(text)) {
+                    o = snapExpressHead(o);
+                    var f = snapExpressFoot(o);
+                    var rest = [o];
+                    remove(o, f.prev);
+                    while (o !== f) {
+                        o = o.next;
+                        rest.push(o);
                     }
+                    text = createString(rest);
                     text = renderExpress(text, false);
                     if (hasdot) text = "..." + text;
-                    o = replace(o, ...scan(text));
+                    var o1 = scan(text);
+                    detour(o1.first, ie);
+                    var s1 = createScoped(o1);
+                    if (s1.used.this) {
+                        var s = getfunc(o, 'this').scoped;
+                        s.used.this.push(...s1.used.this);
+                    }
+                    if (s1.used.arguments) {
+                        var s = getfunc(o, 'arguments').scoped;
+                        s.used.arguments.push(...s1.used.arguments);
+                    };
+                    o = replace(o, ...o1);
                     continue;
                 }
                 text = text.replace(/\.([^\.\[\!\=\:]+)/g, (_, a) => ie === undefined || context.strap_reg.test(a) || /#/.test(a) ? `[${strings.recode(a)}]` : _);

package/coms/frame/edit.html

@@ -4,6 +4,7 @@
 <div body>
     <field v-if="!f.hidden" -repeat="f in fields" ng-src="[f,data]"></field>
 </div>
+<scrollbar></scrollbar>
 <div foot>
     <btn @click="remove()" class="white">取消</btn>
     <button type="submit">保存</button>

package/coms/frame/edit.js

@@ -11,6 +11,7 @@ function main(title, { submit }, { data: origin, fields, }) {
         fields,
         title,
         origin,
+        scrollbar,
         data: item,
         remove() {
             remove(page);
@@ -19,7 +20,7 @@ function main(title, { submit }, { data: origin, fields, }) {
     on('submit')(page, async function (e) {
         e.preventDefault();
         var res = await submit(item, fields, origin);
-        if (typeof res === 'string') {
+        if (typeof res === 'string' && res) {
             return alert(res, 'error');
         }
         if (res === false) return;
@@ -31,7 +32,7 @@ function main(title, { submit }, { data: origin, fields, }) {
         await submit(item, fields, origin);
         dispatch(this, 'submited');
     });
-    on("append")(page, lazy(function () {
+    on("mounted")(page, lazy(function () {
         page.querySelector("input").focus();
     }));
     return page;