efront 3.5.11 → 3.7.0

package/apps/pivot/api.yml

@@ -1,5 +1,8 @@
-./aapi/ authorization: 
-  login: options /::login-:a
-  run: options /:::run
-  share: options /::share-:opt
-  folder: options /::file-:opt:::path?:to
+/ authorization: 
+  login: options ::login-:a
+  run: options :::run
+  share: options ::share-:opt?:path
+  folder: options ::file-:opt:::path?:to
+  cluster: options ::cluster-:opt?:id
+  private-list: options ::private
+  private-edit: options ::private-:key?:value

package/apps/pivot/auth/login.js

@@ -1,7 +1,10 @@
+var hosts = data.getItem("hosts");
+if (!hosts.length) hosts.push({ key: location.host, name: location.host });
 var fields = refilm`
+服务器地址/host* select?a ${hosts}
 密码/password* password
 `;
-
+console.log(fields)
 function main() {
     var page = view();
     page.innerHTML = login;
@@ -9,20 +12,33 @@ function main() {
     on("append")(page, function () {
         move.bindPosition(page, [.5, .5]);
     });
-    renderWithDefaults(page, { fields, data: {}, pending: false });
+    renderWithDefaults(page, {
+        fields, data: {
+            host: location.host,
+        }, pending: false
+    });
     on("submit")(page, async function () {
+        data.setInstance("hosts", hosts, true);
         var { password } = submit(fields, this.$scope.data);
         this.$scope.pending = true;
         page.disabled = true;
         try {
-            var info = await data.from("login", {
+            var login = await data.getApi("login");
+            login.base = location.protocol + "//" + parseURL(this.$scope.data.host).host + "/";
+            cross.addDirect(login.base);
+            var info = await data.from(login, {
                 a: encode62.timeencode(encode62.geta(password))
             }).loading_promise;
+            var apimap = await data.getConfig();
+            for (var k in apimap) {
+                apimap[k].base = login.base;
+            }
             info = encode62.timeupdate(info);
             data.setSource({ authorization: info });
             user.login({})
             go('/main')
-        } catch {
+        } catch (e) {
+            console.log(e);
         }
         this.$scope.pending = false;
     })

package/apps/pivot/home/welcome.html

@@ -1,4 +1,3 @@
-
 <div>
     已登录到服务器，您可以进行如下操作
 </div>
@@ -7,6 +6,11 @@
         清理服务器缓存 <btn @click="run('clear-cache',this)">清理</btn>
     </padding>
 </block>
+<block>
+    <padding>
+        重启服务器 <btn @click="run('rehost',this)" type="danger">重启</btn>
+    </padding>
+</block>
 <block>
     <padding>
         退出登录 <btn @click="logout()">退出</btn>

package/apps/pivot/link/list.html

@@ -0,0 +1,12 @@
+<div class="clusters">
+    <a -repeat="(c,i) in clusters" @click="active(i)">
+        <span -text="c"></span>
+    </a>
+</div>
+<lattice -src="c in clients">
+    <padding>
+        <span -text=c.id></span>
+        <span class="time" -text=filterTime(c.optime)></span>
+        
+    </padding>
+</lattice>

package/apps/pivot/link/list.js

@@ -0,0 +1,25 @@
+function main() {
+    var page = div();
+    page.innerHTML = template;
+    renderWithDefaults(page, {
+        async load() {
+            var cs = this.clusters = data.from("cluster", { opt: "list" });
+            await cs.loading_promise;
+            this.active();
+        },
+        index: 0,
+        clusters: [],
+        filterTime(d) {
+            return ((new Date - d) / 1000 | 0) + "秒";
+        },
+        clients: [],
+        async active() {
+            var index = this.index;
+            var clusters = this.clusters;
+            if (index >= clusters.length) index = clusters.length - 1;
+            this.clients = data.lazyInstance("cluster", { opt: "list", id: clusters[index] });
+        },
+    });
+    page.$scope.load();
+    return page;
+}

package/apps/pivot/link/list.less

@@ -0,0 +1,9 @@
+.clusters a {
+    display: inline-block;
+    margin-right: 20px;
+    padding: 0 6px;
+}
+
+.time {
+    color: #bbb;
+}

package/apps/pivot/main.js

@@ -16,6 +16,9 @@ var layer = layer$glance({
     left: frame$left,
     top: frame$top
 });
+on("append")(layer, function () {
+    frame$route.open();
+});
 function main() {
     return layer;
 }

package/apps/pivot/main.less

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

package/apps/pivot/menu.yml

@@ -2,5 +2,6 @@
 共享目录管理: /share/list
 短链接: /home/short
 WEB文件管理: /wow/root
-# 用户: /home/short
+长连接管理: /link/list
+密钥管理: /token/list
 # 用户列表: /user/list

package/apps/pivot/share/edit.html

@@ -5,6 +5,6 @@
     </form>
 </div>
 <div foot>
-    <button white @click="close()">取消</button>
+    <btn white @click="close()">取消</btn>
     <button @click="save()"> 保存 </button>
 </div>

package/apps/pivot/share/edit.js

@@ -6,8 +6,10 @@ function main({ fields, item }) {
         close() {
             return remove(page);
         },
-        save() {
-            return data.from("share", { opt: item ? 'update' : 'create', data: this.data }).loading_promise;
+        async save() {
+            await data.from("share", { opt: 'create', path: this.data.path }).loading_promise;
+            dispatch(page, 'submited');
+            remove(page);
         },
         data: Object.assign({}, item)
     });

package/apps/pivot/share/list.js

@@ -1,36 +1,56 @@
 var fields = refilm`
 路径/path
-挂载点/name
 `;
-var options = [
-    {
-        name: "删除",
-        do(e) {
-            data.from('share', { opt: 'delete', item: e });
-        }
-    },
-    {
-        name: "修改",
-        do(e) {
-            popup('/share/edit', { fields, item: e });
-        }
-    }
-];
-console.log(fields)
 function main() {
+    var options = [
+        {
+            name(e) {
+                return this.confirm === e ? "确认取消" : "取消"
+            },
+            type: 'danger',
+            confirm: false,
+            timer: 0,
+            async do(e) {
+                if (this.confirm !== e) {
+                    this.confirm = e;
+                    clearTimeout(this.timer);
+                    this.timer = setTimeout(() => render.refresh(this.confirm = null), 2000);
+                    return;
+                }
+                await data.from('share', { opt: 'delete', path: e.path }).loading_promise;
+                page.$scope.load();
+            }
+        }
+    ];
     var page = div();
     page.innerHTML = list;
-    var a = data.from("share", { opt: 'list' }, a => {
-        if (a) return a.map(b => ({ path: b }));
-    });
     renderWithDefaults(page, {
-        data: a,
+        data: [],
+        load() {
+            this.data = data.from("share", { opt: 'list' }, a => {
+                if (a) return a.map(b => ({ path: b }));
+            });
+        },
         fields: fields.concat({
             name: "操作",
+            width: 200,
             type: 'button',
             options,
         }),
     });
-    console.log(a)
+    page.$scope.load();
+    contextmenu(page, [
+        {
+            name: "添加",
+            do(e) {
+                zimoli.prepare("/share/edit", function () {
+                    var p = popup("/share/edit", { fields });
+                    on('submited')(p, function () {
+                        page.$scope.load();
+                    })
+                })
+            }
+        },
+    ])
     return page;
 }

package/apps/pivot/share/list.less

@@ -0,0 +1,7 @@
+>table {
+    width: 100%;
+}
+
+& {
+    height: 100%;
+}

package/apps/pivot/token/edit.js

@@ -0,0 +1,9 @@
+frame$edit.bind(null, "密钥", {
+    submit(a) {
+        return data.from("private-edit", {
+            key: encode62.timeencode(a.key),
+            value: encode62.timeencode(JSON.stringify(a)),
+        }).loading_promise;
+    },
+
+});

package/apps/pivot/token/list.js

@@ -0,0 +1,13 @@
+frame$list.bind(null, "密钥管理", {
+    load() {
+        return data.from("private-list", a => JSAM.parse(encode62.timedecode(a)));
+    },
+    remove(o) {
+        return data.from("private-edit", { key: encode62.timeencode(o.key), value: encode62.timeencode("") }).loading_promise;
+    },
+    fields: refilm`
+显示名/name input
+*键名/key
+密钥/value
+备注/comment
+`}, "/token/edit");

package/coms/basic/JSAM.js

@@ -40,6 +40,10 @@ function stringify(memery) {
     if (memery instanceof Date) return date(memery);
     if (memery instanceof RegExp) return regexp(memery);
     if (!convertReg.test(typeof memery)) return string(memery);
+    m: if (typeof memery === 'function') {
+        for (var k in memery) break m;
+        return '';
+    }
     var dist = [memery];
     var rest = [memery];
     var trimed = [memery instanceof Array ? [] : {}];
@@ -51,6 +55,10 @@ function stringify(memery) {
         o[""] = arr;
         for (var k in memery) {
             var m = memery[k];
+            f: if (typeof m === 'function') {
+                for (var k in m) break f;
+                continue;
+            }
             if (inc === +k && k !== '') {
                 var kindex = "";
                 inc++;

package/coms/basic/loader.js

@@ -521,39 +521,63 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
         return exec.apply(_this, args);
     });
 };
-var bindthen = function (callback) {
-    return function (data) {
-        if (Promise && data instanceof Promise) {
-            data.then(callback);
-        } else {
-            callback(data);
-        }
-    };
-};
-
 
 var init = function (name, then, prebuilds) {
-    then = bindthen(then);
+    // then = bindthen(then);
     var key = keyprefix + name;
     if (prebuilds) {
         if (name in prebuilds) {
-            return then(prebuilds[name]);
+            if (then) then(prebuilds[name]);
+            return prebuilds[name];
         }
     }
     if (hasOwnProperty.call(modules, name)) {
-        then(modules[name]);
-        return;
+        if (then) then(modules[name]);
+        return modules[name];
     }
     if (window[name] !== null && window[name] !== void 0 && !hasOwnProperty.call(forceRequest, name)) {
-        then(modules[name] = window[name]);
-        return;
+        modules[name] = window[name]
+        if (then) then(modules[name]);
+        return modules[name];
     }
+    var oks = [];
+    if (then) oks.push(then);
+    var ohs = [];
+    var res = {
+        oks,
+        ohs,
+        resolved: null,
+        errored: null,
+        then(ok, oh) {
+            if (ok) this.oks.push(ok);
+            if (oh) this.ohs.push(oh);
+            this.fire();
+        },
+        fire() {
+            if (this.resolved || this.errored) {
+                var oks = this.oks.splice(0, this.oks.length);
+                var ohs = this.ohs.splice(0, this.ohs.length);
+                if (this.resolved) for (var o of oks) o(this.resolved);
+                if (this.errored) for (var o of ohs) o(this.errored);
+            }
+        },
+    };
+    then = function (created) {
+        if (Promise && created instanceof Promise) return created.then(then, crack);
+        res.resolved = created;
+        res.fire();
+    };
+    var crack = function (error) {
+        res.errored = error;
+        res.fire();
+    };
     loadModule(name, function (error) {
         if (hasOwnProperty.call(modules, name)) {
             then(modules[name]);
             return;
         }
-        if (error) return;
+        if (error) return crack(error);
+
         var module = loadedModules[key];
         var args = module.args || [];
 
@@ -593,6 +617,7 @@ var init = function (name, then, prebuilds) {
 
         then(created);
     }, prebuilds);
+    return res;
 };
 var forceRequest = {};
 var removeGlobalProperty = function (property) {
@@ -809,7 +834,7 @@ modules.modules = modules;
 var requires_count = 3;
 var hook = function (requires_count) {
     if (requires_count !== 0) return;
-    "alert confirm innerWidth innerHeight close".split(/\s+/).map(removeGlobalProperty);
+    "alert confirm innerWidth innerHeight close prompt".split(/\s+/).map(removeGlobalProperty);
     initPixelDecoder();
     modules.Promise = Promise;
     modules.hook_time = +new Date;

package/coms/basic/refilm_decode.js

@@ -268,7 +268,7 @@ function parse(piece) {
             delete_onempty, delete_onsubmit,
         } = name;
     } else {
-        var test = (reg,a) => {
+        var test = (reg, a) => {
             if (reg.test(a)) {
                 return true;
             }
@@ -388,7 +388,7 @@ function parse(piece) {
             options = is(options);
             var needUnfold = /^\[|\]$/.test(options);
             options = options.replace(/^\[|\]$/g, '');
-            if (/,/.test(options)) options = scanSlant(options, ',');
+            if (needUnfold || /,/.test(options)) options = scanSlant(options, ',');
             else options = scanSlant(options, "");
             if (needUnfold) unfoldOptions(size, options);
         }

package/coms/crypt/encode62.js

@@ -31,7 +31,8 @@ Object.assign(encode62, {
         var time_rest = string.slice(string.length - time_delta.toString(36).length, string.length);
         var time_start = parseInt((new Date() - parseInt(time_rest, 36)) / time_delta) * time_delta;
         var time_stamp = time_start + parseInt(time_rest, 36);
-        return this.decode62(string.slice(0, string.length - time_delta.toString(36).length), time_stamp.toString(36));
+        string = this.decode62(string.slice(0, string.length - time_delta.toString(36).length), time_stamp.toString(36)).replace(/\.\.?/g, a => a === '.' ? "%" : ".");
+        return decodeURIComponent(string);
     },
     timeencode(string) {
         var { time_delta } = this;
@@ -40,6 +41,7 @@ Object.assign(encode62, {
         var time_rest = time_stamp % time_delta;
         var time_rest_str = time_rest.toString(36);
         var time_delta_str = time_delta.toString(36);
+        string = encodeURIComponent(string).replace(/\./g, '..').replace(/%/g, '.');
         return this.encode62(string, time_stamp.toString(36)) + repeat("0", time_delta_str.length - time_rest_str.length) + time_rest_str;
     },
     timeupdate(string) {

package/coms/frame/edit.html

@@ -0,0 +1,10 @@
+<div head>
+    <span v-text="origin?'修改':'添加'"></span><span -text="title"></span>
+</div>
+<div body>
+    <field v-if="!f.readonly||!!data[f.key]" -repeat="f in fields" ng-src="[f,data]"></field>
+</div>
+<div foot>
+    <btn @click="remove()" class="white">取消</btn>
+    <button type="submit">保存</button>
+</div>

package/coms/frame/edit.js

@@ -0,0 +1,29 @@
+function main(title, { submit }, { data: origin, fields, }) {
+    var page = view();
+    var item = Object.assign({}, origin);
+    page.innerHTML = edit;
+    drag.on(page.firstChild, page);
+    resize.on(page);
+    page.onback = function () {
+        return false;
+    };
+    renderWithDefaults(page, {
+        fields,
+        title,
+        origin: item,
+        data: item,
+        remove() {
+            remove(page);
+        },
+    });
+    on('submit')(page, async function (e) {
+        e.preventDefault();
+        await submit(item);
+        dispatch(this, 'submited');
+        remove(this);
+    });
+    on("append")(page, lazy(function () {
+        page.querySelector("input").focus();
+    }));
+    return page;
+}

package/coms/frame/list.html

@@ -0,0 +1,4 @@
+<div>
+    <btn @click="add()">添加</btn>
+</div>
+<table -src="[fields,data]"></table>

package/coms/frame/list.js

@@ -0,0 +1,64 @@
+function main(title, { fields, load, remove }, edit_ref) {
+    prepare(edit_ref);
+    var page = document.createElement("div");
+    var edit = function (o) {
+        zimoli.prepare(edit_ref, function () {
+            var p = popup(edit_ref, { fields, data: o })
+            on("submited")(p, function () {
+                console.log("submited")
+                page.$scope.load();
+            })
+        })
+    };
+    page.innerHTML = template;
+    renderWithDefaults(page, {
+        title,
+        load() {
+            this.data = load();
+        },
+        fields: fields.concat({
+            name: "操作",
+            options: [
+                {
+                    name: "修改",
+                    do(o) {
+                        edit(o);
+                    },
+                },
+                {
+                    type: "danger",
+                    name(o) {
+                        return this.confirm === o ? "确认删除" : "删除";
+                    },
+                    type(o) {
+                        return this.confirm === o ? "dark" : "danger";
+                    },
+                    confirm: false,
+                    timer: 0,
+                    async do(o) {
+                        if (this.confirm !== o) {
+                            this.confirm = o;
+                            clearTimeout(this.timer);
+                            var that = this;
+                            this.timer = setTimeout(function () {
+                                that.confirm = null;
+                                render.refresh();
+                            }, 2000);
+                            return;
+                        }
+                        await remove(o);
+                        page.$scope.load();
+                    }
+                }
+            ]
+        }),
+        data: [],
+        add() {
+            edit();
+        },
+    });
+    on("append")(page, function () {
+        page.$scope.load();
+    });
+    return page;
+}

package/coms/frame/list.less

@@ -0,0 +1,3 @@
+btn{
+    padding: 0 16px;
+}

package/coms/zimoli/LoadingArray.ts

@@ -8,4 +8,7 @@ class LoadingArray extends Array {
     is_readonly = null;
     loading = null;
     loading_promise = null;
+    then(ok, oh) {
+        if (this.loading_promise) this.loading_promise.then(ok, oh);
+    }
 }

package/coms/zimoli/data.js

@@ -333,25 +333,23 @@ function fixApi(api, href) {
             }
             api.base = href;
             api.path = api.url;
-            if (/^\.([\?\#][\s\S]*)?$/.test(api.url)) {
-                api.url = href + api.url.replace(/^\./, "");
-            } else {
-                api.url = href + api.url;
+            if (/^\.([\?\#][\s\S]*)?$/.test(api.path)) {
+                api.path = api.path.replace(/^\./, "");
             }
             if (extraSearch || extraHash) {
                 if (/[\?#]/.test(api.url)) {
                     var [, search, hash] = paramReg.exec(api.url);
                 }
-                var url = api.url.replace(paramReg, '');
+                var path = api.path.replace(paramReg, '');
                 if (extraSearch) {
                     search = search ? extraSearch + '&' + search : extraSearch;
                 }
                 if (extraHash) {
                     hash = hash ? extraHash + '&' + hash : extraHash;
                 }
-                if (search) url += '?' + search;
-                if (hash) url += "#" + hash;
-                api.url = url;
+                if (search) path += '?' + search;
+                if (hash) path += "#" + hash;
+                api.path = path;
             }
         }
     }
@@ -434,7 +432,8 @@ var privates = {
     },
     fromApi(api, params) {
         let url = api.url;
-
+        var base = api.base;
+        if (base) url = base + api.path;
         if (this.validApi(api, params)) {
             params = this.repare(api, params);
             return this.loadIgnoreConfig(api.method, url, params, api);
@@ -657,6 +656,9 @@ var data = {
         data = this.parseConfig(data);
         configPormise = Promise.resolve(data);
     },
+    getConfig() {
+        return privates.getConfigPromise();
+    },
     parseConfig(o) {
         if (o instanceof Promise) {
             return o.then(createApiMap);

package/coms/zimoli/dispatch.js

@@ -9,15 +9,22 @@ var dispatch = "dispatchEvent" in document ? function dispatchEvent(target, even
     }
 };
 function main() {
-    var target, event;
+    var target, event, value;
     for (var cx = 0, dx = arguments.length; cx < dx; cx++) {
         var arg = arguments[cx];
-        if (isString(arg)) {
-            event = createEvent(arg);
-        } else if (isNode(arg) || arg === window || arg === document) {
+        if (isNode(arg) || arg === window || arg === document) {
             target = arg;
-        } else {
-            event = arg;
+        }
+        else if (!event) {
+            if (isString(arg)) {
+                event = createEvent(arg);
+            }
+            else {
+                event = arg;
+            }
+        }
+        else {
+            event.value = arg;
         }
     }
     if (dispatch(target || window, event)) {