efront 3.13.1 → 3.14.0

package/apps/pivot/api.yml

@@ -11,3 +11,10 @@
   version: options ::version
   uptime: options ::uptime
   count: options ::count
+  bootlog: options ::similar
+https://www.ip.cn/ :
+  iplocation: get https://www.ip.cn/api/index?ip=:ip&type=1
+# https://ipchaxun.com/ :
+#   iplocation: get:[].info%20label:nth-child(n+2)>span:nth-child(2) :ip/ 
+# https://www.ip138.com/:
+#   iplocation: get:head>script:nth-last-child(1) iplookup.asp?ip=:ip&action=2

package/apps/pivot/log/boot.html

@@ -0,0 +1,2 @@
+<table -src="[fields,items]">
+</talbe>

package/apps/pivot/log/boot.js

@@ -0,0 +1,44 @@
+var fields = refilm`
+地址/ip
+地理位置/ip ${function (e) {
+        var ip = e.data[e.field.key];
+        var m = /(\d+\.){3}\d+$/.exec(ip);
+        if (m) {
+            var setAddress = function (a) {
+                var l = document.createElement('label');
+                l.innerText = a;
+                appendChild(e, l);
+            };
+            if (e.data.address) setAddress(e.data.address);
+            else data.from("iplocation", { ip: m[0] }, function (a) {
+                e.data.address = a.address;
+                setAddress(a.address);
+            });
+        }
+        return e;
+    }}
+启动时间/time ${function (e) {
+        e.innerHTML = filterTime(e.data[e.field.key]);
+    }}
+端口/port input
+版本/version
+进程/pid
+    `;
+function main() {
+    var page = div();
+    page.innerHTML = template;
+    var items = data.from("bootlog", datas => {
+        datas.forEach(a => {
+            var [v, p] = a.ppid.split("/");
+            a.version = v;
+            a.pid = p;
+        });
+        datas.sort((a, b) => b.time - a.time);
+        return datas;
+    });
+    renderWithDefaults(page, {
+        items,
+        fields
+    });
+    return page;
+}

package/apps/pivot/log/boot.less

@@ -0,0 +1,11 @@
+& {
+    height: 100%;
+}
+
+model {
+    label {
+        display: inline-block;
+        color: #666;
+        font-size: 9px;
+    }
+}

package/apps/pivot/log/count.html

@@ -1 +1,5 @@
-<table -src="[fields,items]"></talbe>
+<div class="searchbox">
+    <input @input="filter" -model="searchText" />
+</div>
+<table -src="[fields,items]">
+</talbe>

package/apps/pivot/log/count.js

@@ -1,14 +1,21 @@
 var fields = refilm`
-路径/path
+路径/path html
 访问量/count
 `;
 function main() {
     var page = div();
     page.innerHTML = template;
+    var items = data.from("count", a => {
+        return Object.keys(a).map(b => ({ path: b, count: a[b] }));
+    });
     renderWithDefaults(page, {
-        items: data.from("count", a => {
-            return Object.keys(a).map(b => ({ path: b, count: a[b] }));
-        }),
+        items,
+        searchText: "",
+        filter() {
+            var text = this.searchText;
+            if (!text) return this.items = items;
+            this.items = search(text, items, 'path');
+        },
         fields
     });
     return page;

package/apps/pivot/log/count.less

@@ -3,6 +3,14 @@
 
 }
 
+.searchbox {
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 2;
+    padding: 8px 16px;
 
-tbody {
-}
+    >input {
+        background: #eee;
+    }
+}

package/apps/pivot/main.js

@@ -7,16 +7,15 @@ cross.addReform(async function ({ status, url, headers }, reform, reject) {
         var base1 = protocol + "//" + host + "/";
         if (base !== base1) {
             data.setSource(base1, null);
-            var page = await popup("/auth/login", base1);
-            care(page, "login", function (info) {
-                data.setSource(base1, info);
-                headers.authorization = info;
-                reform();
-            });
-            on("remove")(page, reject);
-            return false;
         }
-        location.reload();
+        var page = await popup("/auth/login", base1);
+        care(page, "login", function (info) {
+            data.setSource(base1, info);
+            headers.authorization = info;
+            reform();
+        });
+        on("remove")(page, reject);
+        return false;
     }
 })
 data.setReporter(function (m, t) {
@@ -27,7 +26,7 @@ data.bindInstance("base", async function (base) {
     cross.addDirect(base.base);
     var apimap = await data.getConfig();
     for (var k in apimap) {
-        apimap[k].base = base.base;
+        if (apimap[k].method === 'options') apimap[k].base = base.base;
     }
 });
 var base = data.getInstance('base').base;

package/apps/pivot/menu.yml

@@ -1,13 +1,17 @@
 首页: /home/welcome
 WEB:
   共享目录: /share/list
-  短链接: /home/short
+  短链接: /proxy/list
   文件管理: /wow/root
   长连接管理: /link/list
 任务:
   密钥管理: /token/list
   任务建立: /task/list
   定期执行: /tick/list
-# 用户列表: /user/list
+用户:
+  账号列表: /user/list
+  标签管理: /user/tag/list
 服务器日志:
-  访问计数: /log/count
+  访问计数: /log/count
+  启动记录: /log/boot
+  # 并发记忆: /log/lock

package/apps/pivot/proxy/edit.js

@@ -0,0 +1 @@
+pedit.bind(null, "短链接", "proxy");

package/apps/pivot/proxy/list.js

@@ -0,0 +1,12 @@
+var fields = refilm`
+*代理路径/url input/20
+真实路径/realpath url/2000
+/ - ${[{
+    name: "访问",
+    do(o) {
+        var url = o.url;
+        if (!/^\//.test(url)) url = "/" + url;
+        window.open(url,null);
+    }
+}]}`;
+return plist.bind(null, '短链接', "proxy", fields, "/proxy/edit");

package/apps/pivot/user/edit.js

@@ -0,0 +1 @@
+pedit.bind(null, "用户信息", "user");

package/apps/pivot/user/list.js

@@ -0,0 +1,4 @@
+plist.bind(null, '用户管理', "user", refilm`
+*用户ID/key 100
+用户名/name input/300
+`, "/user/edit");

package/apps/pivot/user/tag/edit.js

@@ -0,0 +1 @@
+pedit.bind(null, "标签", "tag");

package/apps/pivot/user/tag/list.js

@@ -0,0 +1,3 @@
+plist.bind(null, '标签', "tag", refilm`
+*标签/key 100
+`, "/user/tag/edit");

package/coms/basic/cross_.js

@@ -180,7 +180,14 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         };
         xhr.form = function (data) {
             xhr.data(data);
-            if (FormData) {
+            var hasFile = false;
+            if (FormData) for (var k in jsondata) {
+                if (isFile(jsondata[k])) {
+                    hasFile = true;
+                    break;
+                }
+            }
+            if (hasFile) {
                 datas = new FormData;
                 for (var k in jsondata) {
                     datas.append(k, jsondata[k]);

package/coms/basic/encodePack.js

@@ -277,27 +277,20 @@ function pack2(buff) {
     var result = [];
     for (var cx = 0, dx = buff.length, bx = 32 * 1024 * 1024; cx < dx; cx += bx) {
         var b = buff.slice(cx, cx + bx);
-        var [l, p, b] = scan(b);
-        l = encodeRange(l);
-        p = encodeRange(p);
+        var b = scan(b);
         var e = encodeRange(b);
         var el = int(e.length);
         result.push(concatTypedArray([
             [
                 range_compress,
                 other_compress << 5 | el.length,
-                l.length >> 8,
-                l.length & 0xff,
-                p.length >> 8,
-                p.length & 0xff
             ],
-            el, l, p, e]));
+            el,  e]));
     }
     result = concatTypedArray(result);
     return pack0(buff, result);
 }
 module.exports = function (buff, type) {
-    type = 1;
     switch (type) {
         case 1:
             return pack(buff);

package/coms/basic/parseURL_test.js

@@ -12,6 +12,8 @@ test('http://yunxu1019@live.cn@github.com/?a', 'username', 'yunxu1019@live.cn')
 test('localhost', 'host', 'localhost')
 test('localhost:80', 'port', '80')
 test('localhost:80/', 'port', '80')
+test('efront.cc', 'host', 'efront.cc')
+test('127.0.0.1', 'host', '127.0.0.1')
 test(':80', 'port', '80')
 test('80', 'port', '80')
 test('/80', 'pathname', '/80')

package/coms/basic/renderExpress.js

@@ -3,7 +3,7 @@ function createSeek(express) {
     express.forEach(function (search) {
         if (dist) {
             if (/[\=]/.test(dist)) dist = `(${dist})`;
-            dist = `${dist}!==void 0&&${dist}!==null?${dist}${search}:''`
+            dist = `typeof ${dist}!=='undefined'&&${dist}!==null?${dist}${search}:''`
         } else {
             dist = search;
         }

package/coms/compile/common.js

@@ -110,7 +110,7 @@ var skipAssignment = function (o) {
     }
     return o;
 };
-var createScoped = function (parsed) {
+var createScoped = function (parsed, wash) {
     var used = Object.create(null); var vars = Object.create(null), lets = vars;
     var scoped = [], funcbody = scoped;
     scoped.isfunc = true;
@@ -206,7 +206,7 @@ var createScoped = function (parsed) {
                             }
                             o = o0;
                             mergeTo(used, used0);
-                            Object.assign(m, declared);
+                            mapDeclared(m, declared);
                             continue loop;
                         case "function":
                             isFunction = true;
@@ -308,6 +308,7 @@ var createScoped = function (parsed) {
                     o.isExpress = isExpress;
                     if (isFunction || isCatch) {
                         var [declared, used0, o0, skiped] = getDeclared(o.first, 'argument');
+                        scoped.args = declared;
                         mergeTo(used, used0);
                         while (skiped.length) {
                             var o1 = run(skiped[0], 0);
@@ -315,7 +316,7 @@ var createScoped = function (parsed) {
                             if (sindex < 0) break;
                             skiped.splice(0, sindex + 1);
                         }
-                        Object.assign(isCatch ? lets : vars, declared);
+                        mapDeclared(isCatch ? lets : vars, declared);
                     }
                     else {
                         run(o.first);
@@ -334,6 +335,19 @@ var createScoped = function (parsed) {
                 if (o.type === SCOPED && o.entry === "{") {
                     o.isExpress = isExpress;
                     run(o.first);
+                    if (wash && isFunction) {
+                        var e = o.next;
+                        if (e && e.type === EXPRESS && /^[\.\[]/.test(e.text) || e && e.type === SCOPED && e.entry === "[") {
+                            scoped.target = true;
+                            e = e.next;
+                        }
+                        if (e && e.type === SCOPED && e.entry === '(') {
+                            if (e.first) {
+                                scoped.pass = getDeclared(e.first)[0];
+                            }
+                            if (scoped.target) scoped.target = scoped.pass.shift();
+                        }
+                    }
                 }
                 else {
                     do {
@@ -407,7 +421,8 @@ var createScoped = function (parsed) {
     return scoped;
 };
 var getDeclared = function (o, kind) {
-    var declared = Object.create(null), used = Object.create(null); var skiped = [];
+    var declared = [], used = Object.create(null); var skiped = [];
+    var prop = null;
     loop: while (o) {
         while (o && o.type === STAMP && o.text === ',') o = o.next;
         if (!o) break;
@@ -423,12 +438,14 @@ var getDeclared = function (o, kind) {
                 if (o.text === "*" && o.next) {
                     if (o.next.type === STRAP && o.next.text === 'as') {
                         o = o.next.next;
+                        prop = "*";
                         continue;
                     }
                 }
             case PROPERTY:
                 if (o.next) {
                     if (o.next.type === STAMP && o.next.text === ":" || o.next.type === STRAP && o.next.text === "as") {
+                        prop = "." + o.text;
                         o = o.next.next;
                         continue;
                     }
@@ -437,7 +454,9 @@ var getDeclared = function (o, kind) {
             case VALUE:
             case EXPRESS:
                 var n = o.text.replace(/^\.\.\.|\.\.\.$/g, '');
-                declared[n] = true;
+                declared.push(n);
+                if (n !== o.text) declared["..."] = n;
+                else if (prop) declared[prop] = n;
                 o.kind = kind;
                 saveTo(used, n, o);
                 o = o.next;
@@ -446,7 +465,8 @@ var getDeclared = function (o, kind) {
                 var [d, u, _, s] = getDeclared(o.first, kind);
                 while (s.length) skiped.push.apply(skiped, s.splice(0, 1024));
                 mergeTo(used, u);
-                Object.assign(declared, d);
+                declared.push(d);
+                if (prop) declared[prop] = d;
                 o = o.next;
                 break;
             default:
@@ -483,9 +503,21 @@ var getDeclared = function (o, kind) {
         if (!o) break;
         if (o.type !== STAMP) break;
         if (o.text !== ',') break;
+        prop = null;
     }
     return [declared, used, o, skiped];
 };
+var mapDeclared = function (map, declared) {
+    var rest = [declared];
+    while (rest.length) {
+        var r = rest.pop();
+        for (var d of r) {
+            if (d instanceof Array) rest.push(d);
+            else map[d] = true;
+        }
+    }
+    return map;
+};
 var saveTo = function (used, k, o) {
     if (!(used[k] instanceof Array)) used[k] = [];
     used[k].push(o);
@@ -498,6 +530,132 @@ var mergeTo = function (used, used0) {
     }
 };
 
+var needBreak = function (prev, next) {
+    if (!prev || !next) return;
+    if (prev.type === STAMP && /^[,;]$/.test(prev.text)) return;
+    if (next.type === STAMP && /^[,;]$/.test(next.text)) return;
+    if (prev.type === EXPRESS && /\.$/.test(prev.text)) return;
+    if (next.type === EXPRESS && /^\./.test(next.text)) return;
+    if (next.type === PROPERTY) return ";";
+    if (next.type === STAMP && next.text === "*") return ";";
+    if (
+        [EXPRESS, VALUE, QUOTED].indexOf(prev.type) >= 0
+        || prev.type === STAMP && /^(\+\+|\-\-)$/.test(prev.text)
+        || prev.type === SCOPED && (prev.isExpress || prev.isObject)
+    ) {
+        if ([EXPRESS, VALUE, QUOTED, LABEL].indexOf(next.type) >= 0) return ";";
+        if (next.type === STRAP) {
+            if (!/^(in|of|extends|instanceof|as)$/.test(next.text)) return ";";
+            return " ";
+        }
+        if (next.type === SCOPED) {
+            if (!next.isExpress) return ";";
+        }
+        return;
+    }
+    if (prev.type === STRAP) {
+        if ([STRAP, EXPRESS, VALUE, QUOTED].indexOf(next.type) >= 0) return " ";
+        if (next.type === LABEL) return ";";
+    }
+};
+
+var createString = function (parsed) {
+    var pressed = parsed.pressed;
+    var lasttype;
+    var result = [];
+    var run = (o, i, a) => {
+        var prev = o.prev;
+        if (!~[SPACE, COMMENT, STAMP, PIECE].indexOf(o.type) && prev && lasttype !== SPACE && !pressed) {
+            if (~[QUOTED, SCOPED, STRAP, LABEL, COMMENT].indexOf(lasttype)
+                || prev.type === STAMP
+                && (!/[\+\-\~\!]$/.test(prev.text) || /[\+\-]$/.test(prev.text) && prev.prev
+                    && (!~[STAMP, STRAP, SCOPED].indexOf(prev.prev.type) || prev.prev.type === SCOPED && prev.prev.isExpress)
+                )) {
+                if (o.type !== SCOPED && (o.type !== EXPRESS || !/^\./.test(o.text))) {
+                    result.push(" ");
+                    lasttype = SPACE
+                }
+            }
+        }
+        switch (o.type) {
+            case COMMENT:
+                // 每一次要远行，我都不得不对自己的物品去粗取精。取舍之间，什么重要，什么不是那么重要，都有了一道明显的分界线。
+                if (!pressed) {
+                    if (lasttype !== SPACE && o.prev) result.push(' ');
+                    result.push(o.text);
+                }
+                break;
+            case SPACE:
+                if (!pressed) {
+                    result.push(o.text);
+                    lasttype = SPACE;
+                    break;
+                }
+                var b = needBreak(o.prev, o.next);
+                if (b) result.push(b);
+                break;
+            case QUOTED:
+                if (!o.length) {
+                    result.push(o.text);
+                    break;
+                }
+            case SCOPED:
+                if (!pressed && o.type !== QUOTED && (lasttype === STRAP || lasttype === COMMENT || lasttype === STAMP
+                    && (!o.prev || !/[\+\-\~\!]$/.test(o.prev.text) || /[\+\-]$/.test(o.prev.text) && (!o.prev.prev || !~[STAMP, STRAP].indexOf(o.prev.prev.type)))
+                    || lasttype === SCOPED && o.entry === "{"
+                )) result.push(" ");
+                result.push(o.entry);
+                if (o.length > 0) {
+                    if (o.entry === "{" && result[0].type !== SPACE) {
+                        if (!pressed) {
+                            result.push(" ");
+                        }
+                    }
+                    lasttype = undefined;
+                    o.forEach(run);
+                    if (/^[,;]$/.test(result[result.length - 1]) && pressed) {
+                        if (!o.prev || o.prev.text !== 'for') result.pop();
+                    }
+                    if (o.leave === "}" && (!o.next || o.next.type !== PIECE) && o[o.length - 1].type !== SPACE) {
+                        if (!pressed) result.push(" ");
+                    }
+                }
+                result.push(o.leave);
+                break;
+            default:
+                if (o instanceof Object) {
+                    if ([STRAP, EXPRESS, PROPERTY, VALUE, COMMENT].indexOf(lasttype) >= 0 && [STRAP, EXPRESS, PROPERTY, VALUE].indexOf(o.type) >= 0) {
+                        result.push(" ");
+                    }
+                    else if (o.prev && o.type === STAMP && !/^([,;])$/.test(o.text)) {
+                        if (result[result.length - 1] === " " || (lasttype === PROPERTY || !o.isExpress && o.prev && o.prev.type !== LABEL) && o.text === ':') { }
+                        else if (lasttype === STAMP) {
+                            result.push(" ");
+                        }
+                        else if (/^(\+\+|\-\-)$/.test(o.prev.text) && o.prev.prev) {
+                            var prev_prev = o.prev.prev;
+                            if (
+                                prev_prev.type === STRAP && !prev_prev.isExpress
+                                || prev_prev.type === EXPRESS
+                                || prev_prev.type === VALUE
+                            ) result.push(";");
+                        }
+                        else if (!/^(\+\+|\-\-)$/.test(o.text)) {
+                            if (!pressed && lasttype !== SPACE) result.push(" ");
+                        }
+                    }
+                    result.push(o.text);
+                }
+                else {
+                    result.push(o);
+                }
+        }
+        lasttype = o.type;
+        if (o.isprop) lasttype = PROPERTY;
+    };
+    parsed.forEach(run);
+    return result.join("");
+}
 
 module.exports = {
     /*-1 */COMMENT,
@@ -514,6 +672,7 @@ module.exports = {
     number_reg,
     skipAssignment,
     getDeclared,
+    createString,
     createScoped,
     saveTo,
     mergeTo

package/coms/compile/scanner.js

@@ -293,9 +293,9 @@ function single_comment_scanner2(index) {
 //     single_comment_scanner2.call(string, 0);
 // }, count); //3354+
 // console.log(t1, t2);
-function block_code_scanner(index, blocks = []) {
+function block_code_scanner(index, blocks = [], keepdeep = Infinity) {
     var save = (blocks instanceof Array) ? function (scanner, children) {
-        if (saved_index < index) {
+        if (deep < keepdeep && saved_index < index) {
             blocks.push(new Block(scanner, saved_index, index, children));
             saved_index = index;
         }
@@ -618,7 +618,7 @@ function lookback_scanner(blockIndex, blocks) {
     return tempIndex;
 }
 
-var scanner = module.exports = function (s) {
+var scanner = module.exports = function (s, keepdeep) {
     var blocks = [];
     var s = String(s);
     // var time = Date.now();
@@ -626,10 +626,13 @@ var scanner = module.exports = function (s) {
     //     block_code_scanner.call(s, 0, blocks);
     // }//angular 1.5.3 x1000 7.0s
     // console.log(Date.now() - time);
-    block_code_scanner.call(s, 0, blocks);
+    block_code_scanner.call(s, 0, blocks, keepdeep);
     // console.log(blocks.map(a => s.slice(a.start, a.end)).join())
     return blocks;
 };
+scanner.autoskip = function (code, start) {
+    return block_code_scanner.call(code, start, null);
+};
 function Block(scanner, start, end, children) {
     this.type = scanner;
     this.start = start;