efront 4.5.3 → 4.5.7

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

@@ -1,17 +1,95 @@
+- zh-CN: 搜索
+  en:    Search
+
+- zh-CN: 发现不同的翻译
+  en:    Discovering different translations
+
+- zh-CN: 确定
+  en:    Confirm
+
+- zh-CN: 导出完成
+  en:    Export completed
+
+- zh-CN: 继续
+  en:    Continue
+
+- zh-CN: 确认
+  en:    Confirm
+
+- zh-CN: 用于$1的证书不可用
+  en:    Certificate not available for $1
+
+- zh-CN: 当前环境无法启用证书更新服务，nodeJs版本为$1
+  en:    "The current environment cannot enable certificate update service, nodeJs version is $1"
+
+- zh-CN: "$1中，由$2引用了如下$3个路径:"
+  en:    "In $1, $2 references the following $3 paths:"
+
+- zh-CN: "读取出错了，路径:"
+  en:    "Error reading, path:"
+
+- zh-CN: 创建账户
+  en:    Create account
+
+- zh-CN: 已创建账户
+  en:    Account created
+
+- zh-CN: 您已创建账户，请确认是否重新创建？
+  en:    "You have created an account, please confirm if you want to create it again?"
+
+- zh-CN: 创建订单
+  en:    Create order
+
+- zh-CN: 订单信息
+  en:    Order information
+
+- zh-CN: 证书列表
+  en:    Certificate List
+
+- zh-CN: 更新服务
+  en:    Update Services
+
+- zh-CN: 证书已更新！
+  en:    The certificate has been updated!
+
+- zh-CN: 更新失败！
+  en:    Update failed!
+
+- zh-CN: 保存成功
+  en:    Save successful
+
+- zh-CN: 替换证书是在不重启服务器的情况下，替换当前服务器的证书
+  en:    "Replacing a certificate is replacing the current server's certificate without restarting the server"
+
+- zh-CN: 替换完成！
+  en:    Replacement completed!
+
+- zh-CN: 上次更新时间
+  en:    Last update time
+
+- zh-CN: 下次更新时间
+  en:    Next update time
+
+- zh-CN: 自动更新周期
+  en:    Automatic update cycle
+
+- zh-CN: 是否开启计划
+  en:    Do you want to start the plan
+
 - zh-CN: 端口异常
   en:    Port abnormality
 
 - zh-CN: 分配地址失败
   en:    Address allocation failed
 
-- zh-CN: 电子邮箱地址应包含符号“@”
+- 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\"@\""
+  en:    "There should be content after the symbol \"@\""
 
 - zh-CN: 私钥
   en:    Private key
@@ -367,8 +445,8 @@
 - zh-CN: 状态错误
   en:    Status error
 
-- zh-CN: 路径<gray>$1</gray>不存在
-  en:    Path<gray>$1</gray>does not exist
+- zh-CN: 路径$1不存在
+  en:    Path $1 does not exist
 
 - zh-CN: 只在主线程中使用
   en:    Only used in the main thread
@@ -1285,8 +1363,8 @@
 - zh-CN: 导出到文件
   en:    Export to file
 
-- zh-CN: 国际化翻译缺失：
-  en:    "Lack of international translation:"
+- zh-CN: 翻译缺失：
+  en:    "Lack of translation:"
 
 - zh-CN: "翻译:"
   en:    "Translation:"
@@ -1732,9 +1810,6 @@
 - zh-CN: 登录中
   en:    Logging in
 
-- zh-CN: 确定
-  en:    Confirm
-
 - zh-CN: 取消
   en:    Cancel
 

package/apps/pivot/api.yml

@@ -8,6 +8,7 @@
   list: options :::type
   edit: options :::type-:key?:value
   add: options :::type-:key+:value
+  patch: options :::type-:key*:value
   params: options ::params-:key
   invoke: options ::invoke-:key?:params
   version: options ::version
@@ -18,7 +19,7 @@
   room: options ::link-:id
   care: options ::care-:id
   cast: options ::cast-:id?:msg
-  setauth|: options ::setauth-/.well-known/acme-challenge/:token?:token.:thumb
+  setauth|: options ::setauth-:auth?:info
   unique: options ::unique
   unique-save: options ::unique-:data
   recert: options ::recert

package/apps/pivot/cert/main.xht

@@ -45,7 +45,12 @@
         appearance: none;
         border: none;
     }
+
+    loading {
+        z-index: 3;
+    }
 </style>
+<loading -if="!finished"></loading>
 <div -if="!enabled"></div>
 <form on-submit="nosubmit" renderid=box>
     <xmenu head #menubar -src="(m,i) in menus" @active="activeMenu(m,i)"></xmenu>
@@ -74,22 +79,25 @@
     var private_key, public_key;
     var unique;
     var loadUnique = async function () {
-        unique = await data.from("unique");
-        await acme2.makeUnique(unique);
-        if (menuIndex === 0) {
-            if (acme2.orders?.length) activeMenu(menus[2], 2);
-            else if (acme2.kid) activeMenu(menus[1], 1);
+        try {
+            unique = await data.from("unique");
+            await acme2.makeUnique(unique);
+            if (menuIndex === 0) {
+                if (acme2.orders?.length) activeMenu(menus[2], 2);
+                else if (acme2.kid) activeMenu(menus[1], 1);
+            }
+            extend(formdata, acme2);
+        } finally {
+            finished = true;
         }
-        extend(formdata, acme2);
     };
-
+    var finished = false;
     var publicKey, privateKey;
     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();
+        acme2.domain = formdata.domain = certlist.map(c => c.hostname).join("\r\n");
     }));
     var a = button;
     var xmenu = menu;
@@ -102,10 +110,18 @@
     };
     var openOrder = async function (event, href) {
         event.preventDefault();
-    }
+    };
+    var uploadOnly = async function (o, extra) {
+        var domains = o.identifiers.map(d => d.value);
+        for (var d of domains) {
+            await pedit.patch("cert", d, extra);
+        }
+    };
+    var setauth = (auth, info) => data.from("setauth", { auth, info });
+
     var menus = [
         {
-            "name": "创建账户",
+            "name": i18n`创建账户`,
             fields: refilm`
             $公钥/public_key/单击生成 ${function (elem) {
                     var { data, field } = elem;
@@ -127,10 +143,13 @@
                 }}
             `,
             get message() {
-                return formdata.kid ? "已创建账户" : '';
+                return formdata.kid ? i18n`已创建账户` : '';
             },
             actions: {
                 async 创建账户(actived) {
+                    if (formdata.kid) {
+                        if (!await confirm(i18n`您已创建账户，请确认是否重新创建？`)) return;
+                    }
                     var params = submit(actived.fields, formdata);
                     await saveUnique(params);
                     formdata.kid = await acme2.newAccount(params);
@@ -139,7 +158,7 @@
             }
         },
         {
-            "name": "创建订单",
+            "name": i18n`创建订单`,
             get disabled() {
                 return !!formdata.kid;
             },
@@ -150,25 +169,26 @@
             actions: {
                 async 创建订单(actived) {
                     var params = submit(actived.fields, formdata);
-                    var order = await acme2.newOrder(params);
+                    await acme2.newOrder(params);
                     await saveUnique();
                     activeMenu(menus[2], 2);
                 }
             }
         },
         {
-            name: "订单信息",
+            name: i18n`订单信息`,
             src: '/cert/orders',
             get params() {
-                return { orders: acme2.orders, saveUnique };
+                return { orders: acme2.orders, saveUnique, setauth, uploadOnly };
             }
         },
         {
-            name: "证书列表",
+            name: i18n`证书列表`,
             src: "/cert/list",
         },
         {
-            name: "更新服务",
+            name: i18n`更新服务`,
+            params: { saveUnique, uploadOnly, setauth },
             src: "/cert/update",
         }
     ];

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;
@@ -110,7 +99,7 @@
     };
 
     function main(params) {
-        var { orders = [], saveUnique } = params;
+        var { orders = [], saveUnique, setauth, uploadOnly } = params;
         orders = orders.map(acme2.parseOrder);
         if (orders.length) orders[0].actived = true;
         var page = document.createElement('orders');
@@ -148,28 +137,12 @@
                 this.order = shallowClone(o);
             },
             async auditOrder(o) {
-                a: for (var a of o.authorizations) {
-                    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 acme2.requestURL(c.url, {});
-                                continue a;
-                            }
-                        }
-                    }
-                    alert("无法找到可用的提审方案" + b.identifier?.value, 'warn');
-                }
-                await wait(600);
+                await acme2.auditOrder(o, setauth);
                 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 });
+                await acme2.finalizeOrder(o, uploadOnly);
                 order = extend({}, o, order);
                 if (o === this.order) o = this.order = order;
                 render.digest();
@@ -181,9 +154,7 @@
                 }
                 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 })
+                    await uploadOnly(o, { cert });
                 }
                 if (this.order === o) this.order = extend({}, o, order);
             },
@@ -217,9 +188,7 @@
             },
             async upload(o) {
                 var cert = await data.fromURL(o.certificate);
-                for (var d of o.identifiers) {
-                    await pedit.merge("cert", d.value, { cert });
-                }
+                await uploadOnly(o, { cert });
                 o.shouldupload = false;
                 o.removable = true;
             }

package/apps/pivot/cert/update.xht

@@ -1,7 +1,40 @@
-<div><button @click="updateCert()">更新证书</button></div>
+<form onsubmit="event.preventDefault()">
+    <div body>
+        <field -repeat="f in fields" -src="[f,acme2]"></field>
+    </div>
+    <div foot>
+        <a confirm @click="autoUpdate()">执行更新</a>
+        <a @click="updateCert()">替换证书</a>
+        <button @click="saveSchadule()">保存计划</button>
+    </div>
+</form>
 <script>
+    var form = view;
+    var a = button;
+    var fields = refilm`$上次更新时间/lastUpdateTime date
+    下次更新时间/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();
+        if (o.status === 'valid') {
+            alert(i18n`证书已更新！`, "success");
+        }
+        else {
+            alert(i18n`更新失败！`, 'error');
+        }
+    };
+    var saveSchadule = async function () {
+        await saveUnique();
+        alert(i18n`保存成功`, "success");
+    };
     var updateCert = async function () {
+        if (!await confirm(i18n`替换证书是在不重启服务器的情况下，替换当前服务器的证书`)) return;
         await data.from("recert");
-        alert("更新完成！", 'success');
+        alert(i18n`替换完成！`, 'success');
     };
 </script>

package/coms/basic/#loader.js

@@ -458,16 +458,17 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
         if (argName === 'import_meta') {
             return new Meta(exec.file);
         }
-        if (/^(?:window|global|undefined)$/.test(argName)) return window[argName];
+        if (/^(?:window|global(This)?|undefined)$/.test(argName)) return window[argName];
         if (argName === "require") {
+            var r1 = window.require;
             let r = function (refer) {
-                if (refer.length) return window.require(refer);
+                if (refer.length) return r1(refer);
                 var mod = required[refer];
                 if ("created" in mod) return mod.created;
                 var c = mod.created = createModule(mod, mod.args || [], mod.argNames, prebuilds);
                 return c;
             };
-            for (let k in window.require) r[k] = window.require[k];
+            for (let k in r1) r[k] = r1[k];
             return r;
         }
         if (argName === "define") return window[argName] || function (m_name, requires, exec) {

package/coms/basic/YAML.js

@@ -1,5 +1,5 @@
 var string = function (a) {
-    if (/^#|\s#|\:(\s|$)|[\[\]\{\}\'\",\r\n\u2028\u2029]/i.test(a)) {
+    if (/^#|\s#|\:(\s|$)|[\[\]\{\}\'\"@,\r\n\u2028\u2029]/i.test(a)) {
         a = strings.encode(a, '"', false);
     }
     return a;

package/coms/basic/awaitable.js

@@ -3,20 +3,21 @@
  * 占用onload onerror complete then 共4个属性
  * @param {Element|Object|any} image;
  */
-function awaitable(image) {
+function awaitable(image, seeker) {
     if (image.complete || image.then) return image;
     var oks = [];
     var ohs = [];
     var resolved = false,
         errored = false,
         error = null;
+    var result = image;
     var fire = function () {
         if (resolved || errored) {
             var _oks = oks.splice(0, oks.length);
             var _ohs = ohs.splice(0, ohs.length);
             if (errored) for (var o of _ohs) o(error);
             delete image.then;
-            if (resolved) for (var o of _oks) o(image);
+            if (resolved) for (var o of _oks) o(result);
             image.then = then;
         }
     };
@@ -28,6 +29,9 @@ function awaitable(image) {
     image.onload = function () {
         if (resolved || errored) return;
         resolved = true;
+        if (isHandled(seeker)) {
+            result = seek(image, seeker);
+        }
         if (!image.complete) image.complete = true;
         fire();
     };

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

@@ -47,7 +47,8 @@ function encodeStructure(array) {
         body
     };
 }
-const pagePathName = location.pathname;
+var { location, navigator, window, document } = this;
+const pagePathName = location ? location.pathname : '';
 const dataSourceMap = {};
 const sourceDataId = 'datasource' + pagePathName;
 const userPrefix = ';';
@@ -318,7 +319,7 @@ function parseConfig(api) {
         required
     };
 }
-var isWorseIE = /msie\s+[2-9]/i.test(navigator.userAgent);
+var isWorseIE = navigator && /msie\s+[2-9]/i.test(navigator.userAgent);
 var parseData = function (sourceText) {
     if (/^\s*<[^\s\'\"\`]/i.test(sourceText)) {
         if (!isWorseIE && window.DOMParser) {
@@ -326,6 +327,7 @@ var parseData = function (sourceText) {
                 return new window.DOMParser().parseFromString(sourceText, "text/html");
             } catch (e) { }
         }
+        if (!document) throw new Error("当前环境不支持处理xml数据！");
         // XML 格式
         var { implementation } = document;
         if (implementation.createHTMLDocument) var doc = implementation.createHTMLDocument("");
@@ -862,21 +864,21 @@ var data = {
     },
     fromApi(api, params, parse) {
         var p = privates.fromApi(api, params);
-        p.id = api.id;
+        if (isEmpty(params)) p.id = api.id;
         return this.createResponse(p, parse);
     },
     postURL(url, data, parse) {
         var p = privates.loadIgnoreConfig("post", url, data);
-        p.id = "post " + url;
+        p.id = url;
         return this.createResponse(p, parse);
     },
     fromURL(url, parse) {
         var p = privates.loadIgnoreConfig('get', url);
-        p.id = "get " + url;
+        p.id = url;
         return this.createResponse(p, parse);
     },
     createResponse(p, parse) {
-        var id = parse instanceof Function ? getInstanceId() : 0;
+        var id = !p.id || parse instanceof Function ? getInstanceId() : 0;
         if (id) this.removeInstance(id);
         var pid = p.id;
         var response = this.getInstance(id || pid);
@@ -886,8 +888,8 @@ var data = {
         response.loading_promise = p;
         p = p.then((data) => {
             response.loading = null;
+            if (parse instanceof Function) data = parse(data);
             if (id) {
-                data = parse(data);
                 this.setInstance(id, data, false);
                 this.removeInstance(id);
             } else {
@@ -910,7 +912,7 @@ var data = {
             p.loading = response.loading = p.loading;
             return p;
         }, oncatch);
-        p.id = sid;
+        if (!isEmpty(params)) p.id = sid;
         var response = this.createResponse(p, parse);
         return response;
     },

package/coms/basic/data.md

@@ -0,0 +1,48 @@
+用于简化网络请求的封装。在浏览器环境中正常可用，nodejs环境下目前仅部分功能可用，且与浏览器有出入。
+
+## 配置
+
+在nodejs环境中暂不能从xml数据中查询子节点的数据，传入的选择器将干扰最终得到的数据
+```javascript
+    // 请求名与请求方法、请求路径的映射关系，双层结构
+    // 每个请求名将生成一个接口对象(apiObj)
+    //    基础路径 头信息?:
+    //        请求的标识1(requestId): 方法1 路径1
+    //        请求的标识2(requestId): 方法2 路径2
+    //        请求的标识3(requestId): 方法3 路径2
+    data.setConfig(requestMap)
+    // 在浏览器环境中可传入相对路径，nodejs环境中暂未测试
+    data.loadConfig(configUrl)
+```
+* 前边两个方法都是把配置加载到全局，下面的方法将生成一个新的请求工具，但生成的功能只有请求网络的功能，返回结果不会包装成周期存储的实例
+
+```javascript
+    data.enrich(requestMap);
+    data.enrich(configUrl);
+```
+
+## 请求网络
+* 不使用`await`时返回结果是周期存储的数据实例，网络请求后会用返回的数据填充这个实例。
+* 使用`await`时结果是返回的数据。
+```javascript
+    data.fromURL(url)
+    data.postURL(url,params)
+    data.fromApi(apiObj)
+    data.from(自动识别参数类型)
+    // 以上几个方法均可以用 await 等待请求的结果
+    await data.from(...);
+```
+
+## 周期存储
+
+当sessionStorage和localStorage可用时，可将数据的生命周期延长
+如果rememberWithStorage传入false，不延长
+否则，如果!!rememberWithStorage为false，只存储到sessionStorage
+否则，即!!rememberWithStorage为true，存储到localStorage
+* 在nodejs环境中记忆周期未做延长，程序退出即消失
+```javascript
+    var instance1 = data.getInstance(instanceId);
+    data.setInstance(instanceId,obj2,rememberWithStorage?);
+    obj2的数据将同步到instance1
+    这两个方法可以在不同作用域中同步数据，也可用于页面或组件传参
+```

package/coms/basic/data_test.js

@@ -0,0 +1,12 @@
+data.setConfig({
+    'http://baidu.com/ a=`1&b=c': {
+        'baidu': 'get .'
+    }
+});
+
+var baiduapi = await data.getApi("baidu");
+assert(baiduapi.base, "http://baidu.com/")
+assert(baiduapi.id, "baidu")
+assert(baiduapi.headers.a, "`1")
+assert(baiduapi.headers.b, "c")
+assert(baiduapi.method, "get")

package/coms/basic/parseYML.js

@@ -1,5 +1,10 @@
 
 var strings = require("./strings");
+var decode = strings.decode;
+var decodeString = function (str) {
+    if (/^[^"']|^""[\s\S]+/.test(str)) return str.replace(/""/g, '"');
+    return decode(str);
+};
 var eval2 = function (data) {
     if (typeof data === 'string') data = data.replace(/(\r\n|\r|\n)$/, '');
     if (!data) return null;
@@ -10,7 +15,7 @@ var eval2 = function (data) {
         /^[\+\-]?(\d+|\d*\.\d+|\d+\.)(e[\-\+]?\d+)?$/i.test(data) ||
         /^(0b[01]+|0x[\da-f]+|0o[0-7]+)$/i.test(data)
     ) data = parseNumber(data);
-    else data = strings.decode(data);
+    else data = decodeString(data);
     return data;
 };
 var scan = function (text) {
@@ -23,7 +28,7 @@ var scan = function (text) {
     var jsonlikes = [];
     var push = function (value) {
         if (data && prop === undefined && jsonlikes[jsonlikes.length - 1] === '{') {
-            prop = strings.decode(data);
+            prop = decodeString(data);
             data = '';
         }
         if (!value) {
@@ -58,9 +63,10 @@ var scan = function (text) {
     };
     while (rows.length) {
         var row = rows.shift();
-
+        isjson = false;
         if (/^['"]$/.test(rowtype)) {
-            if (jsonlikes.length) {
+            var isjson = !!jsonlikes.length || !data
+            if (isjson) {
                 var reg = new RegExp(/\\[\s\S]|/.source + rowtype, 'g');
                 var index = -1;
                 do {
@@ -78,6 +84,7 @@ var scan = function (text) {
                 continue;
             }
             data += row.slice(0, index + +!!jsonlikes.length);
+            if (index == 0 && !data) data = rowtype + rowtype;
             row = row.slice(index + 1);
             if (!row) push();
             else unshift(spacesize, row);
@@ -160,7 +167,7 @@ var scan = function (text) {
                 var pre = row[0];
                 row = row.slice(1);
                 if (pre === ":") {
-                    prop = strings.decode(data);
+                    prop = decodeString(data);
                     data = '';
                 }
                 else {
@@ -208,7 +215,7 @@ var scan = function (text) {
                 if (value) {
                     unshift(spacesize + 1, value);
                 }
-                prop = strings.decode(prop);
+                prop = decodeString(prop);
                 span = spacesize;
                 parents = parents.slice(0, span + 1);
                 continue;

package/coms/basic/parseYML_test.js

@@ -2,7 +2,6 @@ var fs = require("fs");
 var path = require("path");
 var fullpath = path.join(__dirname, "../../.github/workflows/npmpublish.yml");
 var text = fs.readFileSync(fullpath).toString();
-var parseYML = require("./parseYML");
 var test = function (source, expect) {
     var result = parseYML(source);
     var same = assert(result, expect);
@@ -74,3 +73,8 @@ test(`
 c: d
 "a:": b
 `, { c: "d", "a:": "b" });
+
+test(`"@"`, "@")
+test(`"\\"@\\""`, "\"@\"")
+test(`@""@""`, "@\"@\"")
+test(`""@""`, "\"@\"")