efront 3.16.1 → 3.18.0

package/apps/pivot/api/edit.js

@@ -0,0 +1 @@
+pedit.bind(null, "接口", "api");

package/apps/pivot/api/list.js

@@ -0,0 +1,20 @@
+var types = refilm`
+数值/number
+文本/input
+`;
+model.setModels({
+    design: frame$dict.bind(null, types),
+});
+return plist.bind(null, '接口管理', "api", refilm`
+*接口路径/path 100
+接口名/name 100
+请求方法/method select [get,post,put,patch,options]
+数据格式/format select [JSON,JSAM,URLencode]
+!参数/fields design ${[
+        {
+            name: "修改",
+        }
+    ]}
+加密方式/crypt select [timeencode,encode62]
+*是否启用/status radio [不启用,启用]
+`, '/api/edit');

package/apps/pivot/api.yml

@@ -1,4 +1,4 @@
-/ authorization=: 
+/ authorization=:
   login: options ::login-:a
   run: options :::run
   share: options ::share-:opt?:path
@@ -6,15 +6,19 @@
   cluster: options ::cluster-:opt?:id
   list: options :::type
   edit: options :::type-:key?:value
+  add: options :::type-:key+:value
   params: options ::params-:key
   invoke: options ::invoke-:key?:params
   version: options ::version
   uptime: options ::uptime
   count: options ::count
   bootlog: options ::similar
-https://www.ip.cn/ :
+  link: options ::link
+  care: options ::care-:id
+  cast: options ::cast-:id?:msg
+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/ 
+#   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
+#   iplocation: get:head>script:nth-last-child(1) iplookup.asp?ip=:ip&action=2

package/apps/pivot/dict/edit.js

@@ -0,0 +1 @@
+pedit.bind(null, "字典", "dict");

package/apps/pivot/dict/list.js

@@ -0,0 +1,12 @@
+var types = refilm`
+数值/number
+文本/input
+`;
+model.setModels({
+    dict: frame$dict.bind(null, types),
+});
+return plist.bind(null, '接口管理', "dict", refilm`
+*字典ID/key 100
+字典名/name 100
+字典数据/options dict
+`, '/dict/edit');

package/apps/pivot/link/chat.js

@@ -0,0 +1,29 @@
+async function link(id, page) {
+    if (!id) {
+        id = await data.from("link");
+    }
+    page.$scope.title = `会话窗口(<span nodrag>${id}</span>)`;
+    page.roomid = id;
+    var removed = false;
+    on("remove")(page, function () {
+        removed = true;
+        if (xhr.abort) xhr.abort();
+    });
+    var xhr = null;
+    while (true) {
+        if (removed) break;
+        xhr = data.from("care", { id }, function (data) {
+            page.$scope.msglist.push.apply(page.$scope.msglist, data);
+        });
+        await xhr;
+    }
+}
+function main(id) {
+    console.log(id)
+    var page = frame$chat();
+    care(page, 'send', function (msg) {
+        data.from("cast", { id: page.roomid, msg });
+    });
+    link(id, page);
+    return page;
+}

package/apps/pivot/link/chat.less

@@ -0,0 +1,5 @@
+[nodrag] {
+    cursor: text;
+    user-select: text;
+    display: inline-block;
+}

package/apps/pivot/link/list.html

@@ -1,3 +1,7 @@
+<btn @click="chat()">新建连接</btn>
+<div>
+    自动刷新<swap -model="autoreload"></swap>
+</div>
 <div class="clusters">
     <a -repeat="(c,i) in clusters" ng-class="{current:i===index.index}" @click="active(i,c)">
         <span -text="c"></span>
@@ -5,8 +9,9 @@
 </div>
 <lattice -src="c in clients">
     <padding>
-        <span -text=c.id></span>
-        <span class="time" -text=filterTime(c.optime)></span>
-
+        <item @click="chat(c.id)">
+            <span -text=c.id></span>
+            <span class="time" -text=filterTime(c.optime)></span>
+        </item>
     </padding>
 </lattice>

package/apps/pivot/link/list.js

@@ -1,11 +1,23 @@
+var autoreload = true;
 function main() {
     var page = div();
     page.innerHTML = template;
     renderWithDefaults(page, {
-        async load() {
-            this.clusters = data.from("cluster", { opt: "list" });
+        load: lazy(async function () {
+            this.clusters = data.asyncInstance("cluster", { opt: "list" });
             await this.clusters;
             this.active();
+        }, -1000),
+        chat(id) {
+            popup("/link/chat", id);
+        },
+        get autoreload() {
+            return autoreload;
+        },
+        set autoreload(v) {
+            autoreload = v;
+            clearInterval(loadid);
+            if (autoreload) page.$reload();
         },
         index: data.getInstance("index"),
         clusters: [],
@@ -20,6 +32,15 @@ function main() {
             this.clients = data.from("cluster", { opt: "list", id: clusters[index] });
         },
     });
+    var loadid = 0;
+    on("append")(page, function () {
+        if (autoreload) loadid = setInterval(function () {
+            page.$scope.load();
+        }, 30);
+    });
+    on('remove')(page, function () {
+        clearInterval(loadid);
+    });
     page.$scope.load();
     return page;
 }

package/apps/pivot/link/list.less

@@ -11,4 +11,7 @@
 .button.current {
     background: #28c;
     color: #fff;
+}
+btn{
+    padding: 0 16px;
 }

package/apps/pivot/log/boot.js

@@ -11,9 +11,9 @@ var fields = refilm`
                 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;
+            else e.data.address = data.from("iplocation", { ip: m[0] }, function (a) {
                 setAddress(a.address);
+                return a.address;
             });
         }
         return e;
@@ -24,8 +24,11 @@ var fields = refilm`
 端口/port ${async function (e) {
         var { data, field } = e;
         var ports = data[field.key].split(/,/);
-        var loaded = [];
-        for (var p of ports) {
+        var loaded = data.loaded || ports;
+        data.loaded = loaded;
+        e.innerHTML = loaded.join(' ');
+        if (data.loaded === ports) for (let cx = 0, dx = ports.length; cx < dx; cx++) {
+            var p = ports[cx];
             var p0 = p;
             var protocol = /^https/.test(p) ? "https://" : "http://";
             p = p.replace(/[^\d]+/g, '');
@@ -40,18 +43,18 @@ var fields = refilm`
                 }
                 var xhr = await cross("options", `${protocol}${ip}${p}/:version`);
                 if (xhr.responseText === 'efront ' + data.version) {
-                    loaded.push(`<span style="color:green">${p0}</span>`);
+                    loaded[cx] = (`<span style="color:green">${p0}</span>`);
                 } else {
-                    loaded.push(`<span style="color:red">${p0}</span>`);
+                    loaded[cx] = (`<span style="color:red">${p0}</span>`);
                 }
             } catch (e) {
-                loaded.push(`<span style="color:gray">${p0}</span>`);
+                loaded[cx] = (`<span style="color:gray">${p0}</span>`);
             }
-            e.innerHTML = loaded.join('');
+            e.innerHTML = loaded.join(' ');
         }
     }}
-版本 / version text
-进程 / pid
+版本/version input
+进程/pid
     `;
 function main() {
     var page = div();

package/apps/pivot/main.less

@@ -1,4 +1,5 @@
 >:not([layer]) {
     padding: 50px 10px 0;
     min-height: 100%;
+    display: block;
 }

package/apps/pivot/menu.yml

@@ -4,14 +4,17 @@ WEB:
   短链接: /proxy/list
   文件管理: /wow/root
   长连接管理: /link/list
+  字典: /dict/list
+  接口: /api/list
 任务:
   密钥管理: /token/list
   任务建立: /task/list
   定期执行: /tick/list
+  # 服务器: /api/host
 用户:
   账号列表: /user/list
   标签管理: /user/tag/list
 服务器日志:
   访问计数: /log/count
   启动记录: /log/boot
-  # 并发记忆: /log/lock
+  # 并发记忆: /log/lock

package/apps/pivot/proxy/list.js

@@ -1,12 +1,13 @@
 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);
-    }
-}]}`;
+动作/action select/200 [跳转,转发]
+/ $ ${[{
+        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/task/list.js

@@ -3,7 +3,7 @@ plist.bind(null, '任务管理', "task", refilm`
 *任务名/name 100
 *是否启用/status radio [不启用,启用]
 任务代码/code text
-/ - ${[
+/ $ ${[
     {
         when(o) {
             return o.status === 1;

package/apps/pivot/user/api.html

@@ -0,0 +1,2 @@
+<xlist #navbar ng-src="m in apilist"></xlist>
+<container src@="navbar.selected?.path"></container>

package/apps/pivot/user/api.js

@@ -0,0 +1,14 @@
+function main() {
+    var page = document.createElement('user-api');
+    page.innerHTML = template;
+    renderWithDefaults(page, {
+        apilist: ["查询", "添加", "删除", "登录"].map(a => {
+            var [name, path] = a.split(' ');
+            return { name };
+        }),
+        xlist: menu,
+    })
+    page.$scope.apilist[1].actived = true;
+    console.log(page.$scope)
+    return page;
+}

package/coms/basic/Speed.js

@@ -22,12 +22,11 @@ function inertia(gun) {
     }
     var smooth = function () {
         var args = spd.read();
-        if (decrease && args.filter(a => Math.abs(a) > .5).length === 0) {
-            spd.reset();
+        if (decrease && args.filter(a => Math.abs(a) > 2).length === 0) {
             _decrease();
             return;
         }
-        if (args.filter(a => Math.abs(a) > .1).length === 0) {
+        if (args.filter(a => Math.abs(a) > .5).length === 0) {
             spd.reset();
             return;
         }

package/coms/basic/assert.js

@@ -1,5 +1,6 @@
-var dump = function (a) {
-    if (a instanceof Object) console.error('对象的属性不符合'), console.log("  ", a);
+var dump = function (a, msg) {
+    if (a instanceof Object) console.error('对象的属性不符合'), console.log(msg ? msg + " " : "  ", a);
+    else if (msg) console.error(msg + ":", a);
     else console.error(a);
 };
 var assert = function (result, expect, log = dump) {
@@ -48,7 +49,8 @@ var assert = function (result, expect, log = dump) {
     }
     if (!res) {
         if (!hasCollect) collect()();
-        if (log) log(errors);
+        if (typeof log === 'function') log(errors);
+        else dump(errors, log);
     }
     return res;
 }

package/coms/basic/lazy.js

@@ -5,13 +5,28 @@
 function lazy(run, time = false) {
     var wait = +time ? setTimeout : requestAnimationFrame;
     var ing, args, that;
+    var hire = function () {
+        if (time >= 0) {
+            if (ing === true) ing = wait(fire, +time / 2);
+            else wait(fire, +time / 2), ing = -2;
+        }
+        else {
+            wait(fire, -time);
+        }
+    };
     var fire = function () {
         if (time >= 0) {
             if (ing === true) {
-                ing = wait(fire, +time);
+                ing = wait(fire, +time / 2);
+            }
+            else if (ing > 0) {
+                wait(fire, +time / 2);
+                ing = -1;
             }
-            else if (isFinite(ing)) {
+            else if (ing === -1) {
                 ing = run.apply(that, args);
+                if (ing instanceof Promise) ing.then(hire, hire);
+                else ing = false;
             }
             else {
                 ing = false;
@@ -20,13 +35,12 @@ function lazy(run, time = false) {
         else {
             if (ing === true) {
                 ing = run.apply(that, args);
-                wait(fire, -time);
-                if (!ing) ing = 1;
+                if (ing instanceof Promise) ing.then(hire, hire);
+                else ing = wait(fire, -time);
             } else {
                 ing = false;
             }
         }
-        if (ing instanceof Promise) ing.then(fire, fire);
     };
     return function () {
         args = arguments;
@@ -37,8 +51,8 @@ function lazy(run, time = false) {
         }
         else {
             ing = run.apply(that, args);
-            if (ing instanceof Promise) ing.then(fire, fire);
-            ing = wait(fire, -time);
+            if (ing instanceof Promise) ing.then(hire, hire);
+            else ing = wait(fire, -time);
         }
     };
 }

package/coms/basic/lazy_test.js

@@ -0,0 +1,62 @@
+var lazy = require("./lazy");
+var assert = require("./assert");
+async function test(sch, pending, callsch) {
+    pending = +pending || 0;
+    var wait = t => new Promise(a => setTimeout(a, t));
+    var waits = t => wait(t * Math.abs(sch));
+    var waite = async (t) => (await waits(t), await wait(pending));
+    var count = 0, start = Date.now(), time = start;
+    var f = lazy(function () {
+        count++;
+        var now = Date.now();
+        var delta = now - time;
+        time = now;
+        if (count > 1) assert(delta >= Math.abs(sch), true, '触发间隔' + delta);
+        console.log('sch', sch, 'count', count, 'pass', now - start, 'delta', delta, 'pending', pending);
+        if (pending) return wait(pending);
+    }, sch);
+    f();
+    f();
+    f();
+    f();
+    f();
+    callsch = +callsch || 1;
+    var i = setInterval(f, callsch);
+    await wait(.5);
+    if (sch < 0) assert(count, 1, '周期小于0，一个周期内触发');
+    if (sch > 0) assert(count, 0, '周期大于0时，一个周期内不触发');
+    await waite(1.5);
+    if (sch < 0) assert(count, 2, '周期小于0，不到两个周期内触发');
+    await waits(9);
+    if (sch > 0 && sch > callsch) assert(count, 0, '周期大于0时，10个周期内不触发');
+    clearInterval(i);
+    await waits(2);
+    if (sch > 0 && sch > callsch) assert(count, 1, '周期大于0时，等待一个多周期后触发');
+    await waite(2);
+    var saved_count = count;
+    await waite(5);
+    assert(saved_count, count, '未调用时不触发');
+    f();
+    await waite(2);
+    assert(count, saved_count + 1, '非连续调用时，第一次触发');
+    f();
+    await waite(2);
+    assert(count, saved_count + 2, '非连续调用时，第二次触发');
+    f();
+    await waite(2);
+    assert(count, saved_count + 3, '非连续调用时，第二次触发');
+}
+test(100);
+test(-100);
+test(100, 10);
+test(100, 80);
+test(100, 180);
+test(-100, 10, 11);
+test(-100, 80, 81);
+test(-100, 180, 181);
+test(100, 10, 11);
+test(100, 80, 81);
+test(100, 180, 181);
+// test(-100, 180);
+// test(NaN);
+// test(NaN, 80);

package/coms/basic/parseURL.js

@@ -1,5 +1,24 @@
-// -------/// ---------------1---------------------------------///////////////////2-----3--------//////// ------4----2/////5---------------------------------------------------6-----------------------------------------------------------------------------//////////////-7--5///8-------9----------//10--11---10///--12-----8//
-var reg = /^([^\:\/\\\?#\[]+\:(?![^\:\/\\\?\#]*@|[\/\\][^\/\\]))?(?:\/\/|\\\\)?(?:(([^\:\/\\\?#]+)?(?:\:([^\/\\\?#]+))?)@)?(([^\/\\@\?\#\.]*?[^\/\\@\:\?\#\.\d][^\/\\@\:\?\#\.]*?|[^\/\\@\:\?\#\.]+(?:\:[\@\/\\\?#\.]*[^\d\@\:\/\\\?#\.]+|\.[^\/\\@\:\?\#]+?))?(?:(?:\:|^)(\d+))?)(((?:\/|\\|^)[^\?#]*)?(\?([^#]*))?(#[\s\S]*)?)$/;
+// 下图来自 https://nodejs.org/dist/latest-v16.x/docs/api/url.html#urlobjectauth
+// ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
+// │                                              href                                              │
+// ├──────────┬──┬─────────────────────┬────────────────────────┬───────────────────────────┬───────┤
+// │ protocol │  │        auth         │          host          │           path            │ hash  │
+// │          │  │                     ├─────────────────┬──────┼──────────┬────────────────┤       │
+// │          │  │                     │    hostname     │ port │ pathname │     search     │       │
+// │          │  │                     │                 │      │          ├─┬──────────────┤       │
+// │          │  │                     │                 │      │          │ │    query     │       │
+// "  https:   //    user   :   pass   @ sub.example.com : 8080   /p/a/t/h  ?  query=string   #hash "
+// │          │  │          │          │    hostname     │ port │          │                │       │
+// │          │  │          │          ├─────────────────┴──────┤          │                │       │
+// │ protocol │  │ username │ password │          host          │          │                │       │
+// ├──────────┴──┼──────────┴──────────┼────────────────────────┤          │                │       │
+// │   origin    │                     │         origin         │ pathname │     search     │ hash  │
+// ├─────────────┴─────────────────────┴────────────────────────┴──────────┴────────────────┴───────┤
+// │                                              href                                              │
+// └────────────────────────────────────────────────────────────────────────────────────────────────┘
+
+// -------/// ---------------1---------------------------------///////////////////2-----3--------//////// ------4----2/////5---------------------------------------------------6-----------------------------------------------------------------------------//////////////-7--5///8-------9----------//10--11---10/8/--12----////
+var reg = /^([^\:\/\\\?#\[]+\:(?![^\:\/\\\?\#]*@|[\/\\][^\/\\]))?(?:\/\/|\\\\)?(?:(([^\:\/\\\?#]+)?(?:\:([^\/\\\?#]+))?)@)?(([^\/\\@\?\#\.]*?[^\/\\@\:\?\#\.\d][^\/\\@\:\?\#\.]*?|[^\/\\@\:\?\#\.]+(?:\:[\@\/\\\?#\.]*[^\d\@\:\/\\\?#\.]+|\.[^\/\\@\:\?\#]+?))?(?:(?:\:|^)(\d+))?)(((?:\/|\\|^)[^\?#]*)?(\?([^#]*))?)(#[\s\S]*)?$/;
 function parseURL(url) {
     if (url === undefined || url === null) url = '';
     var [__, protocol, auth, username, password, host, hostname, port, path, pathname, search, query, hash] = reg.exec(url);

package/coms/basic/refilm_decode.js

@@ -277,14 +277,15 @@ function parse(piece) {
             var reg = /^[\*\+\-\!\-\$&\?\~]|[\*\+\-\!\-\$&\?\~]$/;
             if (!reg.test(a)) return a;
             required = test(/^\*|\*$/, a);
-            inlist = test(/^[\+\!]|[\+\!]$/, a);
+            if (test(/^[\+]|[\+]$/, a)) inlist = true;
+            if (test(/^[\!]|[\!]$/, a)) inlist = false;
             hidden = test(/^\-|\-$/, a);
             readonly = test(/^[\$&]|[\$&]$/, a);
             delete_onempty = test(/^\?|\?$/, a);
             delete_onsubmit = test(/^\~|\~$/, a);
             return a.replace(reg, '');
         };
-        type = is(type);
+        var type1 = is(type);
         if (typeof name === 'string') {
             if (!isContainer) {
                 if (!type) {
@@ -299,6 +300,7 @@ function parse(piece) {
                             type = last_type;
                     }
                 } else {
+                    type = type1;
                     last_type = type;
                 }
             }

package/coms/frame/chat.html

@@ -0,0 +1,13 @@
+<div head -html="title">
+</div>
+<grid body>
+    <chat -src="m in msglist">
+        <msg class="msg" -src="m"></msg>
+    </chat>
+    <div textarea>
+        <div contenteditable="true" -model="text"></div>
+    </div>
+</grid>
+<div foot>
+    <btn @click="send()">发送</btn>
+</div>

package/coms/frame/chat.js

@@ -0,0 +1,39 @@
+
+function msg(elem) {
+    care(elem, function (data) {
+        if (!data) return;
+        var m = JSAM.parse(data);
+        if (m) switch (m.type) {
+            case "html":
+                elem.innerHTML = m.content;
+                break;
+            default:
+                elem.innerText = data;
+        }
+    })
+}
+function chat(title = '会话窗口') {
+    var page = view();
+    page.innerHTML = template;
+    drag.on(page.firstChild, page);
+    resize.on(page);
+    renderWithDefaults(page, {
+        chat: list,
+        title,
+        grid,
+        msglist: [],
+        text: '',
+        localid: Math.random(),
+        msg,
+        send() {
+            if (!this.text) return;
+            cast(page, "send", JSAM.stringify({
+                type: 'html',
+                sender: this.localid,
+                content: this.text,
+            }));
+            this.text = '';
+        }
+    });
+    return page;
+}