efront 4.4.14 → 4.5.3

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");
@@ -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;
             }
@@ -330,7 +331,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 +395,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/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;
@@ -32,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,29 @@ 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);
+                    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/compile//347/264/240/351/246/250.js

@@ -401,7 +401,6 @@ var getFromScopeList = function (name, varsList, value = name) {
 };
 var removeSelectorSpace = a => a.trim().replace(/\s*([\+~\>])\s*/g, "$1");
 var fixBase = function (b, a) {
-    var s = splitParams(a);
     return splitParams(a).map(a => {
         if (presets.test(a)) a = `@{${a}}`;
         var replaced = false;
@@ -426,9 +425,11 @@ function evalscoped(scoped, base = '') {
     base = removeSelectorSpace(base);
     var smaps = scoped.maps;
     var root = smaps[":root"], scope = smaps[":scope"];
+    var and = smaps["&"];
     var vars = extend(Object.create(null), scoped.vars);
     if (root) root.forEach(r => extend(vars, r.vars));
     if (scope) scope.forEach(s => extend(vars, s.vars));
+    if (and) and.forEach(a => extend(vars, a.vars));
     var vlist = [vars];
     var mlist = [macros];
     var clist = [smaps];

package/coms/docs/codetext.xht

@@ -109,8 +109,8 @@
                 case QUOTED:
                     if (o.length || !o.text) {
                         o.forEach(setcolor);
-                        o.entry = "<text>" + o.entry;
-                        o.leave = o.leave + "</text>";
+                        o.entry = "<text>" + o.entry + "</text>";
+                        o.leave = "<text>" + o.leave + "</text>";
                         break;
                     }
                 case PIECE:
@@ -299,7 +299,7 @@
             }
         }
         if (minSpace > 0) codes = codes.map(c => /^\s+/.test(c) ? c.slice(minSpace) : c);
-        return `<code type=${type}>${codes.join("<br/>").replace(/\t/g, Array(5).join('&ensp;')).replace(/\s/g, '&ensp;')}</code> `;
+        return `<code type=${type}>${codes.join("<br/>").replace(/\t/g, Array(5).join('&ensp;')).replace(/\s/g, '&ensp;')}</code>`;
     }
     codetext.encode = encode;
 </script>

package/coms/frame/chat.js

@@ -168,7 +168,7 @@ function chat(title = '会话窗口') {
             }
         }
     };
-    page.renders = [function () {
+    page.$renders = [function () {
         this.$scope.resize(this.$scope.body);
     }];
     page.localid = localid;

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;

package/coms/kugou/bindScroll.js

@@ -53,6 +53,6 @@ function bindScroll(titlebar, page) {
         setOpacity(label, 1 - (titlebar.offsetHeight - topHeight) / (offsetHeight - topHeight));
         return {};
     };
-    if (!page.renders) page.renders = [];
+    if (!page.$renders) page.$renders = [];
     page.onscroll = refresh;
 }

package/coms/kugou/krc.js

@@ -72,7 +72,7 @@ function createLRC(lrc) {
                     setClass(krcList, index);
                 }
             }
-            if (ele && firstChild && firstChild.isMounted) {
+            if (ele && firstChild && firstChild.$mounted) {
                 var marginTop = (firstChild.parentNode.offsetHeight - ele.offsetHeight >> 1) - ele.offsetTop + firstChild.offsetTop;
                 css(firstChild, `margin-top:${marginTop | 0}px;`);
             }
@@ -140,7 +140,7 @@ function createKRC(krc) {
             var current_row_word = current_words[current_row_index];
             var ele = krcList[index];
             var firstChild = krcList[0];
-            if (ele && firstChild && firstChild.isMounted) {
+            if (ele && firstChild && firstChild.$mounted) {
                 var marginTop = (firstChild.parentNode.offsetHeight - ele.offsetHeight >> 1) - ele.offsetTop + firstChild.offsetTop;
                 if (index > 0) {
                     if (markerLabel.parentNode !== ele) {

package/coms/layer/leftCenter.js

@@ -38,12 +38,12 @@ function setCurrentPage(page) {
     var currentLayer = getCurrentLayer();
     if (page !== leftPage) {
         if (currentLayer !== leftLayer) {
-            if (!leftPage.isMounted) appendChild(leftLayer, leftPage);
+            if (!leftPage.$mounted) appendChild(leftLayer, leftPage);
         } else {
             remove(leftPage, false);
         }
         if (page.parentNode !== currentLayer) appendChild(currentLayer, page, false);
-    } else if (!leftPage.isMounted) {
+    } else if (!leftPage.$mounted) {
         appendChild(leftLayer, leftPage, false);
     }
 }
@@ -54,16 +54,16 @@ function main(_leftPage) {
 layer.layer = function (child, old) {
     remove(old);
     if (child === leftPage) {
-        if (!leftPage.isMounted) appendChild(leftLayer, child);
+        if (!leftPage.$mounted) appendChild(leftLayer, child);
     } else if (child) {
         var currentLayer = getCurrentLayer();
         appendChild(currentLayer, child);
         if (currentLayer === leftLayer) {
             if (arguments.length > 1) remove(leftPage);
-        } else if (!leftPage.isMounted) {
+        } else if (!leftPage.$mounted) {
             appendChild(leftLayer, leftPage);
         }
     } else {
-        if (!leftPage.isMounted) appendChild(leftLayer, leftPage);
+        if (!leftPage.$mounted) appendChild(leftLayer, leftPage);
     }
 };

package/coms/pivot/acme2.js

@@ -0,0 +1,290 @@
+var acmebase = `https://acme-v02.api.letsencrypt.org/`;
+var data1 = data.enrich(parseYML(`
+${acmebase}:
+  directory: get directory
+${acmebase}acme/ Content-Type=application/jose+json:
+  key-change: get key-change
+  new-account: post:^efront-location new-acct
+  get-account: get acct/:aid
+  new-order: post:^efront-location new-order
+  get-order|: get order/:aid/:oid
+  new-nonce: head:^Replay-Nonce new-nonce
+  revert-cert: post:^efront-location revert-cert
+`));
+var publicKey, privateKey;
+var private_key, public_key;
+var RSASSA_PKCS1_v1_5 = "RSASSA-PKCS1-v1_5";
+var base64url = function (params) {
+    var data = JSON.stringify(params);
+    return toBase64(encodeUTF8(data), true);
+};
+var accountApi = await data1.getApi('get-account');
+var orderApi = await data1.getApi('get-order');
+var wrapParams = async function (url, params, usejwk = false) {
+    var protected = {
+        url
+    };
+    var jwk = await subtle.exportKey("jwk", publicKey);
+    protected.alg = jwk.alg;
+    if (usejwk) {
+        protected.jwk = {
+            e: jwk.e,
+            kty: jwk.kty,
+            n: jwk.n
+        };
+    }
+    else {
+        protected.kid = acme2.kid;
+    }
+    protected.nonce = await data1.from("new-nonce");
+    protected = base64url(protected);
+    var payload = isHandled(params) ? base64url(params) : '';
+    var params = {
+        protected,
+        payload,
+        signature: toBase64(new Uint8Array(await subtle.sign({ name: RSASSA_PKCS1_v1_5, saltLength: 32 }, privateKey, new Uint8Array(encodeUTF8([protected, '.', payload].join(''))))), true)
+    };
+    return params;
+}
+var request = async function (id, params) {
+    var api = await data1.getApi(id);
+    if (/^(get|head)$/i.test(api.method)) return data1.from(id, params);
+    var [url, rest] = data.prepareURL(api.base + api.path, params);
+    var restparams = {};
+    rest.forEach(k => { restparams[k] = params[k]; delete params[k]; });
+    var params = await wrapParams(url, params, /new-account|revert-cert/i.test(id));
+    extend(params, restparams);
+    var account = await data1.from(id, params);
+    return account;
+};
+var ASN1 = function (type) {
+    var length = 0;
+    var bytesarr = [];
+    for (var cx = 1, dx = arguments.length; cx < dx; cx++) {
+        var bytes = arguments[cx];
+        if (bytes.constructor !== Array) {
+            bytes = Array.apply(null, bytes);
+        }
+        bytesarr.push(bytes);
+        length += bytes.length;
+    }
+    var asn1 = [type];
+    if (length === (2 << 8 | 36)) console.log(arguments)
+    if (length > 127) {
+        var nums = [];
+        while (length > 0) {
+            nums.unshift(length & 0xff);
+            length = length >>> 8;
+        }
+        asn1.push(0x80 | nums.length, ...nums);
+    }
+    else {
+        asn1.push(length);
+    }
+    asn1 = asn1.concat(...bytesarr);
+    return asn1;
+};
+var packUint = function (bytes) {
+    if (bytes[0] & 0x80) {
+        return ASN1(0x02, [0], bytes);
+    }
+    return ASN1(0x02, bytes);
+};
+var packBits = function (bytes) {
+    return ASN1(0x03, [0x00], bytes);
+};
+var packPublicKey = function (jwk) {
+    var n = packUint(fromBase64(jwk.n));
+    var e = packUint(fromBase64(jwk.e));
+    var p = ASN1(0x30, n, e);
+    return ASN1(0x30, ASN1(0x30,
+        ASN1(0x06, [0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01]),
+        ASN1(0x05),
+    ), packBits(p));
+};
+var packCSR = function (asn1pubkey, domains) {
+    return ASN1(0x30,
+        packUint([0x00]),
+        ASN1(0x30, ASN1(0x31, ASN1(0x30,
+            ASN1(0x06, [0x55, 0x04, 0x03]),
+            ASN1(0x0c, encodeUTF8(domains[0]))
+        ))),
+        asn1pubkey,
+        ASN1(0xa0, ASN1(0x30,
+            ASN1(0x06, [0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x09, 0x0e]),
+            ASN1(0x31, ASN1(0x30, ASN1(0x30,
+                ASN1(0x06, [0x55, 0x1d, 0x11]),
+                ASN1(0x04, ASN1(0x30,
+                    ...domains.map(d => ASN1(0x82, encodeUTF8(d)))
+                ))
+            )))
+        ))
+    )
+}
+
+var createCSR = async function (domains, private_key) {
+    var privateKey = await subtle.importKey("pkcs8", new Uint8Array(fromBase64(private_key)), {
+        name: RSASSA_PKCS1_v1_5,
+        hash: "SHA-256",
+    }, true, ["sign"]);
+    var jwk = await subtle.exportKey("jwk", privateKey);
+    var pubkey = packPublicKey(jwk);
+    var request = packCSR(pubkey, domains);
+    var sign = new Uint8Array(await subtle.sign({ name: RSASSA_PKCS1_v1_5, saltLength: 32 }, privateKey, new Uint8Array(request)));
+    var sty = ASN1(0x30,
+        ASN1(0x06, [0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b]),
+        ASN1(0x05)
+    );
+    return ASN1(0x30, request,
+        sty,
+        packBits(sign)
+    );
+};
+var makeKeyPair = async function (modulusLength = 2048) {
+    //https://www.w3.org/TR/WebCryptoAPI/ 第20章 只有RSASSA-PKCS1-v1_5的jwk的alg才是rs256
+    var k = await subtle.generateKey({
+        name: RSASSA_PKCS1_v1_5,
+        modulusLength,
+        publicExponent: new Uint8Array([1, 0, 1]),
+        hash: "SHA-256",
+    }, true, ["sign", "verify"]);
+    var { publicKey, privateKey } = k;
+    var private_key = await subtle.exportKey("pkcs8", privateKey);
+    var public_key = await subtle.exportKey("spki", publicKey);
+    private_key = toBase64(new Uint8Array(private_key));
+    public_key = toBase64(new Uint8Array(public_key));
+    return [private_key, public_key];
+};
+var subtle = this.crypto?.subtle;
+var acme2 = new class {
+    email = '';
+    kid = '';
+    aid = '';
+    oid = '';
+    domain = '';
+    termsOfServiceAgreed = false;
+    orders = [];
+    public_key = '';
+    get enabled() {
+        return !!subtle;
+    }
+    async requestURL(url, params) {
+        params = await wrapParams(url, params);
+        var res = data.postURL(url, params);
+        if (res.loading) res.loading.setRequestHeader("Content-Type", "application/jose+json");
+        return res;
+    }
+    async initUnique() {
+        [private_key, public_key] = await makeKeyPair(4096);
+        var unique = [private_key, public_key].join(',');
+        await acme2.makeUnique(unique);
+    }
+    async makeUnique(unique) {
+        if (!unique) return;
+        var avme2 = this;
+        var extra;
+        [private_key, public_key, extra] = unique.split(',');
+        if (extra) {
+            extra = JSON.parse(decodeUTF8(fromBase64(extra)));
+            avme2.email = extra.email;
+            avme2.kid = extra.kid;
+            if (extra.kid) {
+                var account = data.getUrlParamsForApi(accountApi, extra.kid);
+                avme2.aid = account.aid;
+            }
+            avme2.domain = extra.domain;
+            avme2.termsOfServiceAgreed = extra.termsOfServiceAgreed;
+            avme2.orders = extra.orders;
+        }
+        try {
+            privateKey = await subtle.importKey("pkcs8", new Uint8Array(fromBase64(private_key)), {
+                name: RSASSA_PKCS1_v1_5,
+                hash: "SHA-256",
+            }, true, ["sign"]);
+            publicKey = await subtle.importKey("spki", new Uint8Array(fromBase64(public_key)), {
+                name: RSASSA_PKCS1_v1_5,
+                hash: "SHA-256",
+            }, true, ["verify"]);
+
+            avme2.public_key = public_key;
+        } catch (e) { alert("加载服务器公钥异常！", "error"); throw e }
+    }
+    pickUnique() {
+        var avme2 = this;
+        var extra = {
+            kid: avme2.kid,
+            email: avme2.email,
+            domain: avme2.domain,
+            orders: avme2.orders,
+            termsOfServiceAgreed: avme2.termsOfServiceAgreed
+        };
+        return [private_key, public_key, base64url(extra)].join(",");
+    }
+    async getTermsOfService() {
+        var data = await data1.from("directory");
+        var termsOfService = data?.meta?.termsOfService;
+        return termsOfService;
+    }
+    async newAccount(params) {
+        var account = await request("new-account", {
+            "contact": [
+                "mailto:" + params.email
+            ],
+            // onlyReturnExisting: false,// 可选
+            // externalAccountBinding: {},// 可选
+            "termsOfServiceAgreed": params.termsOfServiceAgreed
+        });
+        this.email = params.email;
+        this.termsOfServiceAgreed = params.termsOfServiceAgreed;
+        this.kid = account;
+        var a = data.getUrlParamsForApi(accountApi, account);
+        this.aid = a.aid;
+        alert('创建成功！', 'success');
+        return account;
+    }
+    async newOrder(params) {
+        if (!this.orders) this.orders = [];
+        if (this.orders.length > 20) return alert("请删除一些订单后再试！", "error");
+        var params = {
+            "identifiers": params.domain.trim().split(/[,;+，；\r\n\u2029\u2028\s]+/).map(n => {
+                if (/^\d+(\.\d+){3}$/.test(n)) return { type: "ipv4", value: n };
+                return { type: "dns", value: n };
+            })
+        };
+        var order = await request("new-order", params);
+        this.domain = params.domain;
+        var i = this.orders.indexOf(order);
+        if (i >= 0) this.orders.splice(i, 1);
+        this.orders = [order].concat(this.orders);
+        return order;
+    }
+    parseOrder(o) {
+        if (typeof o !== 'string') return o;
+        var order = data.getUrlParamsForApi(orderApi, o);
+        order.url = o;
+        order.name = order.oid;
+        return order;
+    }
+    async getOrder(o) {
+        var r = await data.fromURL(o.url);
+        if (r.expires) r.expires = new Date(r.expires);
+        return r;
+    }
+    async thumbprint() {
+        var jwk = await subtle.exportKey('jwk', publicKey);
+        jwk = `{"e":"${jwk.e}","kty":"${jwk.kty}","n":"${jwk.n}"}`;
+        var thumb = await subtle.digest("SHA-256", new Uint8Array(encodeUTF8(jwk)));
+        thumb = toBase64(new Uint8Array(thumb), true);
+        return thumb;
+    }
+    async createKeyPair() {
+        return makeKeyPair(2048);
+    }
+    async createCSR(domains, private_key) {
+        var csr = await createCSR(domains, private_key);
+        return toBase64(csr, true);
+    }
+    async audit(url) {
+        return data.fromURL(url);
+    }
+}