efront 4.32.3 → 4.33.0

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

@@ -2282,7 +2282,7 @@
   en:    "You may open the port opened to view the demo: $1"
 
 - zh-CN: 请在空目录或efront目录执行创建操作!
-  en:    Please perform the creation operation in an empty or front directory!
+  en:    Please perform the creation operation in an empty or efront directory!
 
 - zh-CN: 当前文件夹不为空！
   en:    The current folder is not empty!
@@ -2399,7 +2399,7 @@
   en:    Connect to an efront server and obtain the Dash
 
 - zh-CN: 用一个连接号登录本机的efront服务器，接收并打印消息
-  en:    Log in to the front server of the local machine with a Dash to receive and print messages
+  en:    Log in to the efront server of the local machine with a Dash to receive and print messages
 
 - zh-CN: 向一个连接号发送消息
   en:    Send a message to a Dash
@@ -2408,7 +2408,7 @@
   en:    Check for External variable in a file or folder
 
 - zh-CN: 执行按efront方式加载的代码
-  en:    Executing code loaded in front mode
+  en:    Executing code loaded in efront mode
 
 - zh-CN: 查找含有指定的外部变量的文件
   en:    Find the file containing the specified External variable

package/apps/pay/alipay.jsp

@@ -51,7 +51,7 @@ ACQ.MERCHANT_PERM_RECEIPT_DAY_LIMIT	超过单日累计收款额度	联系支付
         return a;
     }
     var amount = request.id;
-    if (!/^(\d+)(\.\d+)?$/.test(amount)) amount = encode62.packdecode(request.id);
+    if (!/^(\d+)(\.\d+)?$/.test(amount)) amount = crypt$encode62.packdecode(request.id);
     var [amount, subject = '网页扫码支付'] = amount.split(',');
     var trade_no = createId();
     if (!+amount) return forbidden("参数异常");

package/coms/basic/ASN1.js

@@ -0,0 +1,26 @@
+var ASN1 = function (tag) { // tag=tagClass|type|composed_flag
+    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 = [tag];
+    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;
+};

package/coms/basic/ASN_1.js

@@ -0,0 +1,131 @@
+exports = ASN1;
+export const
+    UNIVERSAL = 0x00,
+    APPLICATION = 0x40,
+    CONTEXT_SPECIFIC = 0x80,
+    PRIVATE = 0xC0;
+export const
+    NONE = 0,
+    BOOLEAN = 1,
+    INTEGER = 2,
+    BITSTRING = 3,
+    OCTETSTRING = 4,
+    NULL = 5,
+    OID = 6,
+    ODESC = 7,
+    EXTERNAL = 8,
+    REAL = 9,
+    ENUMERATED = 10,
+    EMBEDDED = 11,
+    UTF8 = 12,
+    ROID = 13,
+    SEQUENCE = 16,
+    SET = 17,
+    PRINTABLESTRING = 19,
+    IA5STRING = 22,
+    UTCTIME = 23,
+    GENERALIZEDTIME = 24,
+    BMPSTRING = 30;
+export const CONSTRUCTED = 0x20;
+export var Null = ASN1(NULL);
+export var integer = function (value) {
+    if (value.length) return ASN1(INTEGER, value);
+    if (value == 0) return ASN1(INTEGER, [0]);
+    let bytes = [];
+    let isNegative = value < 0;
+    if (typeof value === 'bigint') {
+        if (isNegative) value = -value + 1n;
+        while (value > 0) {
+            bytes.push(Number(value & BigInt(0xff)));
+            value >>= BigInt(8);
+        }
+    }
+    else {
+        if (isNegative) value = -value + 1;
+        while (value > 0) {
+            bytes.push(value & 0xff);
+            value >>= 8;
+        }
+    }
+    if ((bytes[0] & 0x80) !== 0 && !isNegative) bytes.push(0x00);  // 正数 MSB 0
+    if ((bytes[0] & 0x7f) === 0 && isNegative) bytes.push(0xff);  // 负数 MSB 1
+    bytes.reverse();
+    return ASN1(INTEGER, bytes);
+};
+export var boolean, bool = boolean = function (v) {
+    return ASN1(BOOLEAN, [v ? 0xff : 0]);
+};
+export var True = bool(true);
+export var False = bool(false);
+export var bitString = function (bytes) {
+    return ASN1(BITSTRING, bytes);
+};
+export var octetString = ASN1.octet = function (bytes) {
+    return ASN1(OCTETSTRING, bytes);
+};
+export var oid = function () {
+    var [oid] = arguments;
+    if (typeof oid === 'string') oid = oid.split('.').map(a => +a);
+    if (typeof oid === 'number') oid = Array.prototype.slice.call(arguments, 0, arguments.length);
+    var first = 40 * oid[0] + oid[1];
+    oid = [first].concat(oid.slice(2));
+    var bytes = [OID];
+    for (var arc of oid) {
+        if (arc === 0) {
+            bytes.push([0]);
+            continue;
+        };
+        var bts = [];
+        while (arc > 0) {
+            bts.push(arc % 128);
+            arc = Math.floor(arc / 128);
+        }
+        bts.reverse();
+        for (let i = 0; i < bts.length - 1; i++) {
+            bts[i] |= 128;
+        }
+        bytes.push(bts);
+    }
+    return ASN1.apply(null, bytes);
+};
+export var utf8 = function (string) {
+    if (typeof string === 'string') string = encodeUTF8(string);
+    return ASN1(UTF8, string);
+};
+export var printable = function (string) {
+    if (typeof string === 'string') string = encodeUTF8(string);
+    return ASN1(PRINTABLESTRING, string);
+};
+var getTime = function (value) {
+    if (typeof value === "number" || /^\d+[\/\\\-]/i.test(value)) value = new Date(value);
+    if (value instanceof Date) {
+        var n = n => n < 10 ? '0' + n : n;
+        value = [
+            value.getUTCFullYear(),
+            value.getUTCMonth() + 1,
+            value.getUTCDate(),
+            value.getUTCHours(),
+            value.getUTCMinutes(),
+            value.getUTCSeconds()
+        ].map(n).join("") + "Z";
+    }
+    return value;
+}
+export var generaltime, time = generaltime = function (value) {
+    value = getTime(value);
+    return ASN1(GENERALIZEDTIME, encodeUTF8(value));
+};
+export var utctime = function (value) {
+    // yyMMddhhmmssZ
+    value = getTime(value).slice(-13);
+    return ASN1(UTCTIME, encodeUTF8(value));
+}
+export var set = function (...bytes) {
+    return ASN1(SET | CONSTRUCTED, ...bytes);
+}
+export var sequence = function (...bytes) {
+    return ASN1(SEQUENCE | CONSTRUCTED, ...bytes);
+}
+export var specific = function (...bytes) {
+    return ASN1(CONTEXT_SPECIFIC | CONSTRUCTED, ...bytes);
+}

package/coms/basic/SliceRange.js

@@ -0,0 +1,86 @@
+function checkRange(from, to) {
+    if (!isFinit(from) || !isFinit(to)) throw Error('边界异常！');
+    if (from > to) throw new Error(`左边界${from}大于右边界${to}！`);
+}
+function copyCaped(copyto, caped) {
+    copyto.length = caped.length;
+    for (var cx = 0, dx = copyto.length; cx < dx; cx++) {
+        copyto[cx] = caped[cx];
+    }
+}
+// 包含from不包含to，步进单位是1
+function SliceRange(from, to) {
+    checkRange(from, to);
+    if (!this || this.constructor !== SliceRange) return new SliceRange(from, to);
+    if (from < to) {
+        this[0] = [from, to];
+        this.length = 1;
+    }
+    else {
+        this.length = 0;
+    }
+}
+
+SliceRange.prototype.delete = function (from, to) {
+    checkRange(from, to);
+    var caped = [];
+    for (var cx = 0, dx = this.length; cx < dx; cx++) {
+        var [m, n] = this[cx];
+        delete this[cx];
+        if (m >= from && n <= to) continue;
+        if (n < from || m > to) {
+            caped.push([m, n]);
+            continue;
+        }
+        if (m < from) {
+            caped.push([m, from]);
+        }
+        if (n > to) {
+            caped.push([to, n]);
+        }
+    }
+    copyCaped(this, caped);
+};
+SliceRange.prototype.split = function (maxSize) {
+    var caped = [];
+    for (var cx = 0, dx = this.length; cx < dx; cx++) {
+        var [m, n] = this[cx];
+        while (n - m > maxSize) {
+            caped.push([m, m += maxSize]);
+        }
+        if (n > m) caped.push([m, n]);
+    }
+    copyCaped(this, caped);
+};
+SliceRange.prototype.add = function (from, to) {
+    checkRange(from, to);
+    if (from === to) return;
+    var caped = [];
+    var pushed = false;
+    for (var cx = 0, dx = this.length; cx < dx; cx++) {
+        var [m, n] = this[cx];
+        delete this[cx];
+        if (n < from) {
+            caped.push([m, n]);
+            continue;
+        }
+        if (m > to) {
+            if (!pushed) {
+                caped.push([from, to]);
+                pushed = true;
+            }
+            caped.push([m, n]);
+            continue;
+        }
+        if (m >= from) {
+            m = from;
+        }
+        if (n <= to) {
+            n = to;
+        }
+        from = m, to = n;
+    }
+    if (!pushed) caped.push([from, to]);
+    copyCaped(this, caped);
+}
+SliceRange.prototype[Symbol.iterator] = Array.prototype[Symbol.iterator];

package/coms/basic/decodeASN1.js

@@ -0,0 +1,240 @@
+var BigInt = this.BigInt;
+function int(b) {
+    var Num = BigInt ? BigInt : Number;
+    var a = b;
+    var s = Num(0);
+    var isNeg = a[0] & 0x80;
+    if (isNeg) {
+        if (a[0] === 0xff) a = a.slice(1);
+    }
+    for (var cx = 0, dx = a.length; cx < dx; cx++) {
+        s = s * Num(256) + Num(a[cx]);
+    }
+    if (s > 0x1fffffffffffff && !BigInt) {
+        return b;
+        // throw new Error('数值精度超出限制！');
+    }
+    if (s < 0x1fffffffffffff && BigInt) s = Number(s);
+    if (isNeg) s = -s;
+    return s;
+}
+
+function oid(a) {
+    var d = [];
+    for (var cx = 0, dx = a.length; cx < dx;) {
+        var n = 0;
+        do {
+            var b = a[cx++];
+            n = n * 128 + (b & 0x7f);
+        } while (b & 0x80);
+        d.push(n);
+    }
+    var n = d[0];
+    d.splice(0, 1, n / 40 | 0, n % 40);
+    return d.join('.');
+}
+
+var typeNames = [
+    'NONE',
+    'BOOLEAN',
+    'INTEGER',
+    'BITSTRING',
+    'OCTETSTRING',
+    'NULL',
+    'OID',
+    'ODESC',
+    'EXTERNAL',
+    'REAL',
+    'ENUMERATED',
+    'EMBEDDED',
+    'UTF8',
+    'ROID',
+    '14',
+    '15',
+    'SEQUENCE',
+    'SET',
+    'NUMERICSTRING',
+    'PRINTABLESTRING',
+    'TELETEXSTRING',
+    'VIDEOTEXSTRING',
+    'IASSTRING',
+    'UTCTIME',
+    'GENERALIZEDTIME',
+    'GRAPHICSTRING',
+    'VISIBLESTRING',
+    'GENERALSTRING',
+    'UNIVERSALSTRING',
+    'CHARACTERSTRING',
+    'BMPSTRING',
+    '31',
+];
+var classNames = [
+    'UNIVERSAL',
+    "APPLICATION",
+    "CONTEXT_SPECIFIC",
+    "PRIVATE"
+];
+var typeMap = {
+    "octet": "octetString",
+    "bit": "bitString",
+    "generalizedtime": "time",
+    "boolean": 'bool',
+};
+var { SEQUENCE, SET, CONTEXT_SPECIFIC } = ASN_1;
+var stringify = function (obj, deep = 1) {
+    var deep1 = deep + 1;
+    var space1 = Array(deep1).join("    ");
+    var space = Array(deep).join("    ");
+    if (obj instanceof Array) {
+        var a = [];
+        for (var o of obj) {
+            var d = stringify(o, deep1);
+            a.push(d);
+        }
+        return a.join(",\r\n" + space1);
+    }
+    if (!obj) return;
+    var a = obj.tagName.toLowerCase().split('|').map(a => a.trim());
+    var iscollect = obj.type === SEQUENCE || obj.type === SET || !obj.type && obj.class === CONTEXT_SPECIFIC;
+    var n = a.filter(a => a != "constructed").map(a => a.split("_").pop()).join("_");
+    if (iscollect && !obj.constructed) n += "_noconstruct";
+    if (!iscollect && obj.constructed) n += "_constructed";
+    if (n === 'null') return `Null`;
+    if (obj.children) {
+        if (obj.children.length) return `${n}(// ${deep}, ${obj.length}\r\n${space1}${stringify(obj.children, deep)}\r\n${space})`;
+        return `${n}()`;
+    }
+    var value = obj.value !== obj.data ? obj.value : `[${Array.prototype.slice.call(obj.data, 0, obj.data.length).join(', ')}]`;
+    var comment = '';
+    if (typeof value === 'bigint') value = value > 0x1fffffffffffff || value < -0x1fffffffffffff ? String(value) + "n" : value;
+    else if (obj.value !== obj.data) {
+        if (value in valueComment) comment = valueComment[value];
+        value = JSON.stringify(value);
+    }
+    if (!/_/.test(n)) n = n.replace(/string$/i, ''), n = typeMap[n] || n;
+    if (n in ASN_1) var res = `${n}(${value})`;
+    else res = `ASN1(${obj.tagName}, ${value})`;
+    if (comment) res = `/* ${comment} */\r\n${space}` + res;
+    return res;
+}
+var valueComment = {};
+class Asn1Object {
+    toString(comment) {
+        var _comment = valueComment;
+        if (typeof comment === "object" && comment !== null) valueComment = comment;
+        var res = stringify(this, this.deep || 1);
+        valueComment = _comment;
+        return res;
+    }
+}
+function decodeASN1(buff, deep = 0) {
+    var parsed = [];
+    deep++;
+    for (var index = 0, cx = 0, dx = buff.length; cx < dx; index++) {
+        var bx = cx;
+        var tag = buff[cx++];
+        if (!tag) break;
+        var length = buff[cx++];
+        if (length >= 0x80) {
+            var length = 0x7f & length;
+            var num = 0;
+            while (length > 0) {
+                length--;
+                var b = buff[cx++];
+                num = (num << 8) + b;
+            }
+            length = num;
+        }
+        var data, value = data = buff.slice(cx, cx += length);
+        var bf = buff.slice(bx, cx);
+        var constructed = !!(0x20 & tag);
+        var Class = tag & 0xc0;
+        var className = classNames[Class >>> 6];
+        var type = tag & 0x1f;
+        var typeName = typeNames[type];
+        var hasChildren = false;
+        var showValue = false;
+        switch (type) {
+            case 0:// 保留给编码规则使用
+                hasChildren = constructed;
+                if (hasChildren) value = decodeASN1(value, deep);
+                break;
+            case 1:// 布尔类型
+                showValue = !constructed;
+                if (showValue) value = !!value[0];
+                break;
+            case 2:// 整型
+                showValue = !constructed;
+                if (showValue) value = int(value);
+                break;
+            case 5:// NULL
+                showValue = !constructed;
+                if (showValue) value = null;
+                break;
+            case 6:// oid
+                showValue = !constructed;
+                if (showValue) value = oid(value);
+                break;
+            case 12:// UTF8 字符串类型
+                showValue = !constructed;
+                if (showValue) value = decodeUTF8(value);
+                break;
+            case 16:// 序列和类型序列
+                value = decodeASN1(value, deep);
+                hasChildren = true;
+                break;
+            case 17:// 集合和类型的集合
+                value = decodeASN1(value, deep);
+                hasChildren = true;
+                break;
+            case 19: // 可打印字符串
+                showValue = !constructed;
+                if (showValue) value = decodeUTF8(value);
+                break;
+            case 23: // utc 时间 1950 - 2049
+                showValue = !constructed;
+                if (showValue) value = new Date(decodeUTF8(value).replace(/^(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})(Z|\+\d{4})$/, function (_, yy, MM, dd, hh, mm, ss, zone) {
+                    yy = +yy;
+                    if (yy < 50) yy += 100;
+                    yy += 1900;
+                    return `${yy}-${MM}-${dd}T${hh}:${mm}:${ss}${zone}`;
+                }));
+                break;
+            case 24: // utc 时间 4位年份
+                showValue = !constructed;
+                if (showValue) value = new Date(decodeUTF8(value).replace(
+                    /^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2}(?:\.\d+)?)(Z|\+\d{4})$/,
+                    "$1-$2-$3T$4:$5:$6$7"
+                ));
+                break;
+        }
+
+        var obj = new Asn1Object(...{
+            tag,
+            tagName: [
+                Class ? className : '',
+                type ? typeName : '',
+                constructed ? 'CONSTRUCTED' : ''
+            ].filter(a => !!a).join(" | "),
+            type, typeName,
+            length,
+            constructed,
+            deep,
+            buff: bf,
+            index,
+            class: Class, className,
+            data, value
+        });
+        if (hasChildren) obj.children = value;
+        for (var k in obj) {
+            if (!/^(tag|index|deep|value|children|length)/.test(k) || k === "deep" && !hasChildren || k === "value" && !showValue) {
+                Object.defineProperty(obj, k, { value: obj[k], enumerable: false });
+            }
+        }
+        parsed.push(obj);
+    }
+    return parsed;
+}
+function main(data) {
+    return decodeASN1(data)[0];
+}

package/coms/basic/encodeASN1.js

@@ -0,0 +1,45 @@
+import {
+    BOOLEAN,
+    bool,
+    INTEGER,
+    integer,
+    UTCTIME,
+    utctime,
+    UTF8,
+    utf8,
+    PRINTABLESTRING,
+    printable,
+    NULL,
+    Null,
+    OID,
+    oid,
+    GENERALIZEDTIME,
+    time
+} from "./ASN_1";
+// 将由decodeASN1生成的结构重新编码成二进制数据
+function encodeASN1(object) {
+    var { type, data, class: class1, constructed, value } = object;
+    var tag = object.tag || type | class1 | constructed;
+    if (object.children) {
+        if (constructed === undefined) constructed = true;
+        data = object.children.map(encodeASN1);
+        return ASN1(tag, ...data);
+    }
+    else if (value !== undefined) {
+        switch (type) {
+            case BOOLEAN: data = bool(value); break;
+            case INTEGER: data = integer(value); break;
+            case OID: data = oid(value); break;
+            case UTCTIME: data = utctime(value); break;
+            case GENERALIZEDTIME: data = time(value); break;
+            case UTF8: data = utf8(value); break;
+            case NULL: data = Null; break;
+            case PRINTABLESTRING: data = printable(value); break;
+            default: data = ASN1(tag, data);
+        }
+    }
+    else {
+        data = ASN1(tag, data);
+    }
+    return data;
+}

package/coms/basic/sortname.js

@@ -84,6 +84,8 @@ var parse干支 = function (a) {
     return (12 + g - z) % 12 / 2 * 10 + g + 1;
 };
 var compare = function (a, b) {
+    if (a.name) a = a.name;
+    if (b.name) b = b.name;
     for (var cx1 = a.length - 1, cx2 = b.length - 1; cx1 >= 0 && cx2 >= 0; cx1--, cx2--) {
         while (/[\s\u00a0]/.test(a[cx1])) cx1--;
         while (/[\s\u00a0]/.test(b[cx2])) cx2--;

package/coms/basic/strings.js

@@ -45,8 +45,22 @@ function uncode(s) {
     return s.replace(/\\u(?:\{[0-9a-f]+\}|[0-9a-f]{4})/ig, esc);
 }
 function kicode(s) {
-    return s.replace(/\\(?:u\{[0-9a-f]+\}|u[0-9a-f]{4}|x[0-9a-f]{2}|([0-7]{1,3}|[\s\S]))/ig, (a, b) => {
-        if (!b) return esc(a);
+    var t = [];
+    return s.replace(/\\(?:u\{[0-9a-f]+\}|u[0-9a-f]{4}|x[0-9a-f]{2}|([0-7]{1,3}|[\s\S]))/ig, (a, b, i) => {
+        if (!b) {
+            if (/^\\x/.test(a)) {
+                b = parseInt(a.slice(2, 4), 16);
+                t.push(b);
+                i += a.length;
+                if (!/^\\x[0-9a-f]{2}$/i.test(s.slice(i, i + 4))) {
+                    b = decodeUTF8(t);
+                    t = [];
+                    return b;
+                }
+                return "";
+            }
+            return esc(a);
+        }
         if (unescapeMap.hasOwnProperty(a)) return unescapeMap[a];
         if (/^[0-7]+$/.test(b)) return String.fromCharCode(parseInt(b, 8));
         return b;

package/coms/basic_/&defineProperty.js

@@ -0,0 +1 @@
+Object.defineProperty;

package/coms/compile/Html.js

@@ -82,7 +82,15 @@ var fixElement = function (o) {
                 ps = ps.slice(cx);
                 if (!ps.length);
                 else if (ps.length === 1) {
-                    push(ps[0]);
+                    if (ps[0].type === SCOPED) {
+                        push(ps[0]);
+                    }
+                    else {
+                        push(new Node({
+                            type: QUOTED,
+                            text: strings.encode(ps[0].text)
+                        }));
+                    }
                 }
                 else {
                     ps.type = QUOTED;
@@ -206,7 +214,6 @@ Html.prototype.createScoped = function (code) {
                 break;
             case QUOTED:
             case PIECE:
-
                 if (c.length) {
                     c.forEach(run);
                     break;
@@ -227,10 +234,12 @@ Html.prototype.createScoped = function (code) {
                             used[k].push(...s.used[k]);
                         }
                     }
+                    for (var k in vars) delete used[k];
                 }
                 break;
             case EXPRESS:
                 if (inScript || noTag) break;
+                if (c.queue.type === QUOTED) break;
                 var t = c.text;
                 t = parseExpress(t);
                 var s = createScoped(t);