efront 4.23.9 → 4.24.1

package/apps/pivot/db/edit.xht

@@ -34,8 +34,8 @@
     }
 </style>
 <div head>
-    编辑数据 - <span -bind="db.name"></span>
-    <a @click="add">添加</a>
+    ${i18n`编辑数据`} - <span -bind="db.name"></span>
+    <a @click="add">${i18n`添加`}</a>
 </div>
 
 <lattice body -src="m in items">
@@ -84,7 +84,7 @@
         茨菰$编辑框(elem);
         elem.setValue(JSON.stringify(m, null, 4));
         var changed = false;
-        await prompt(elem, '输入JSON格式的数据', function (text) {
+        await prompt(elem, i18n`输入JSON格式的数据`, function (text) {
             try {
                 JSON.parse(text);
                 return true;
@@ -106,7 +106,7 @@
         elem.type = 'json';
         茨菰$编辑框(elem);
         var changed = false;
-        await prompt(elem, '输入JSON格式的数据', function (text) {
+        await prompt(elem, i18n`输入JSON格式的数据`, function (text) {
             try {
                 JSON.parse(text);
                 return true;

package/apps/pivot/db/list.xht

@@ -25,13 +25,13 @@
     }
 </style>
 <lattice body a-src="db in dbs">
-    <div insert><a @click="adddb">添加</a></div>
+    <div insert><a @click="adddb">${i18n`添加`}</a></div>
     <padding db>
         <div>
             <h2> ⩸ </h2>
             <h2 -bind="db.name"></h2>
-            <a @click="go('/db/edit',db)">查看</a>
-            <a @click="go('/db/config',db)">配置</a>
+            <a @click="go('/db/edit',db)">${i18n`查看`}</a>
+            <a @click="go('/db/config',db)">${i18n`配置`}</a>
             <drop @click.singly.stop="deldb(db)"></drop>
         </div>
     </padding>
@@ -53,7 +53,7 @@
         await load();
     };
     var deldb = async function (db) {
-        var a = await prompt(i18n`输入名称以确认删除`, ["删除#danger", '取消'], a => a === db.name, {
+        var a = await prompt(i18n`输入名称以确认删除`, [i18n`删除` + "#danger", i18n`取消`], a => a === db.name, {
             async submit(v) {
                 await data.from('dbdel', { id: v });
             }

package/apps/pivot/dht/list.js

@@ -12,11 +12,11 @@ var fields = refilm`名称/name
 return plist.bind({
     fields,
     type: 'nodes',
-    title: "DHT服务器管理",
+    title: i18n`DHT服务器管理`,
     buttons: [{
-        name: "从文件读取", async do() {
+        name: i18n`从文件读取`, async do() {
             var FileReader = window.FileReader;
-            if (!FileReader) return alert('当前浏览器无法读取文件', 'warn')
+            if (!FileReader) return alert(i18n`当前浏览器无法读取文件`, 'warn')
             var f = await chooseFile(".torrent", true);
             var pg = await popup("/dht/rent");
             var scope = $scoped.get(pg);
@@ -34,7 +34,7 @@ return plist.bind({
                     ok();
                 };
                 r.onerror = function () {
-                    alert("读取文件失败！", 'error');
+                    alert(i18n`读取文件失败！`, 'error');
                     oh();
                 };
                 r.readAsArrayBuffer(f);

package/apps/pivot/dict/edit.js

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

package/apps/pivot/dict/list.js

@@ -5,7 +5,7 @@ var types = refilm`
 model.setModels({
     dict: frame$dict.bind(null, types),
 });
-return plist.bind(null, '接口管理', "dict", refilm`
+return plist.bind(null, i18n`接口管理`, "dict", refilm`
 *字典ID/key 100
 字典名/name 100
 字典数据/options dict

package/apps/pivot/home/welcome.html

@@ -1,35 +1,70 @@
-<block>
-</block>
 <block>
     <padding>
-        服务器版本&nbsp;&nbsp;<span -text="String(version)"></span>
+        <span>
+            ${i18n`注册号`}
+        </span>
+        <template -if="usercode">
+            <span -text="String(usercode)"></span>
+            <!-- <a @click="unregister">${i18n`注销`}</a> -->
+        </template>
+        <a -else @click="register">${i18n`注册`}</a>
     </padding>
     <padding>
-        nodejs版本&nbsp;&nbsp;<span -text="String(nodeVersion)"></span>
+        <span>
+            ${i18n`服务器版本`}
+        </span>
+        <span -text="String(version)"></span>
     </padding>
     <padding>
-        操作系统&nbsp;&nbsp;<span -text="String(platform)"></span>
+        <span>
+            ${i18n`nodejs版本`}
+        </span>
+        <span -text="String(nodeVersion)"></span>
     </padding>
     <padding>
-        处理器&nbsp;&nbsp;<span -text="String(arch)"></span>
+        <span>
+            ${i18n`操作系统`}
+        </span>
+        <span -text="String(platform)"></span>
+    </padding>
+    <padding>
+        <span>
+            ${i18n`处理器`}
+        </span>
+        <span -text="String(arch)"></span>
     </padding>
 </block>
 <block>
     <padding>
-        清理服务器缓存 <btn @click="run('clear-cache',this)">清理</btn>
+        <span>
+            ${i18n`清理服务器缓存`}
+        </span>
+        <btn @click="run('clear-cache',this)">${i18n`清理`}</btn>
     </padding>
     <padding>
-        重启服务器 <btn @click="run('rehost',this)" confirm type="danger">重启</btn>
+        <span>
+            ${i18n`重启服务器`}
+        </span>
+        <btn @click="run('rehost',this)" confirm type="danger">${i18n`重启`}</btn>
     </padding>
 </block>
 <block>
     <padding>
-        启动时间&nbsp;&nbsp;<span -text="filterTime(hrtime)"></span>
+        <span>
+            ${i18n`启动时间`}
+        </span>
+        <span -text="filterTime(hrtime)"></span>
     </padding>
     <padding>
-        内存 <progbar danger:="memery[0]/memery[1]<.05" :current="memeryUsed" :total="memery[1]"></progbar>
-        <span style="color: #999;">
-            可用<span -bind="size(memery[0])"></span> / 总内存<span -bind="size(memery[1])"></span>
+        <span>
+            ${i18n`内存`}
+        </span>
+        <span>
+            <progbar danger:="memery[0]/memery[1]<.05" :current="memeryUsed" :total="memery[1]"></progbar>
+            <div>
+                <span -bind="size(memery[0])"></span>
+                / <span -bind="size(memery[1])"></span>
+            </div>
         </span>
     </padding>
 </block>

package/apps/pivot/home/welcome.js

@@ -8,11 +8,16 @@ function main() {
         filterTime,
         memeryUsed: 0,
         memery: [0, 1],
-        platform: '未知',
-        arch: '未知',
-        nodeVersion: "未知",
+        platform: i18n`未知`,
+        arch: i18n`未知`,
+        nodeVersion: i18n`未知`,
         size,
         progbar,
+        usercode: null,
+        async register() {
+            var usercode = await data.from("register");
+            serverStatus.userid = scope.usercode = usercode;
+        },
         async run(id) {
             await new Promise(ok => setTimeout(ok, 2000));
             var info = await data.from("run", {
@@ -22,13 +27,14 @@ function main() {
         }
     };
     renderWithDefaults(page, scope);
-    data.from("status").then(a => {
+    (function (a) {
         var [mr, mt] = a.memery;
         scope.memeryUsed = mt - mr;
         scope.memery = a.memery;
         scope.nodeVersion = a.nodeVersion;
         scope.platform = a.platform;
         scope.arch = a.arch;
-    });
+        scope.usercode = a.userid;
+    }(serverStatus));
     return page;
 }

package/apps/pivot/home/welcome.less

@@ -13,8 +13,23 @@ btn {
 }
 
 padding {
+    display: block;
+    color: #666;
+    .button {
+        margin: 0;
+    }
+
     >span {
-        color: #999;
+        vertical-align: top;
+        &:first-child {
+            // width: 120px;
+        }
+        >div{
+            line-height: 1.2;
+            font-size: 12px;
+        }
+        display: inline-block;
+        color: #333;
         margin-right: 10px;
     }
 }

package/apps/pivot/link/index.js

@@ -2,10 +2,13 @@ function index() {
     var page = document.createElement('link-index');
     page.innerHTML = template;
     renderWithDefaults(page, {
-        menus: "房间 /link/room, 会话 /link/list".split(/\s*,\s*/).map(a => {
-            var [name, path] = a.split(/\s+/);
-            return { name, path };
-        }),
+        menus: [{
+            name: i18n`房间`,
+            path: '/link/room'
+        }, {
+            name: i18n`会话`,
+            path: '/link/list'
+        }],
         saveIndex(index) {
             data.setInstance('link-index', index);
         },

package/apps/pivot/link/list.html

@@ -16,10 +16,10 @@
 </style>
 <div head>
     <span>
-        自动刷新
+        ${i18n`自动刷新`}
     </span>
     <swap -model="autoreload"></swap>
-    <btn @click="chat()">新建连接</btn>
+    <btn @click="chat()">${i18n`新建连接`}</btn>
 </div>
 <div class="clusters">
     <a -repeat="(c,i) in clusters" ng-class="{current:i===index.index}" @click="active(i,c)">

package/apps/pivot/link/room.js

@@ -1,7 +1,7 @@
-plist.bind(null, '房间', "room", refilm`
+plist.bind(null, i18n`房间`, "room", refilm`
 *房间名/name 100
 / $ ${[{
-        name: "连接",
+        name: i18n`连接`,
         async do(o) {
             var linkid = await data.from("room", { id: encode62.packencode(o.name) });
             popup("/link/chat", { linkid, name: o.name });

package/apps/pivot/main.js

@@ -1,3 +1,5 @@
+frame$route.update(await data.fromURL(i18n`menu.yml`));
+i18n.setReloader(zimoli.reload);
 data.loadConfig("api.yml");
 user.loginPath = '/auth/login';
 var login_queue = [], reject_queue = [];

package/apps/pivot/menu-en.yml

@@ -0,0 +1,16 @@
+Home Page: /home/welcome
+WEB:
+  Path Redirects: /proxy/list
+  File Manager: /wow/root
+  Data Manager: /db/list
+  Living Link: /link/index
+  # Dictionary: /dict/list
+  Cert Manager: /cert/main
+  Shared Path: /share/list
+Service:
+  Key Manager: /token/list
+  Task Manager: /task/list
+Logs:
+  Visit Count: /log/count
+  Boot Log: /log/boot
+# Shop: /shop/home

package/apps/pivot/proxy/edit.js

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

package/apps/pivot/proxy/list.js

@@ -1,6 +1,6 @@
 var actions = [
     {
-        name: "访问",
+        name: i18n`访问`,
         do(o) {
             var url = o.url;
             if (!/\//.test(url)) url = "//" + url;
@@ -16,4 +16,4 @@ var fields = refilm`
 动作/action select/100 [跳转,转发]
 状态/status select/100 [启用,禁用]
 / $ ${actions}`;
-return plist.bind(null, '短链接', "proxy", fields, "/proxy/edit");
+return plist.bind(null, i18n`短链接`, "proxy", fields, "/proxy/edit");

package/apps/pivot/register.jsp

@@ -0,0 +1,4 @@
+<script serverside>
+    var data = await readdata(req);
+    return await runtask('server-register', req, data);
+</script>

package/apps/pivot/share/edit.html

@@ -1,10 +1,10 @@
-<div head>修改</div>
+<div head>${i18n`修改`}</div>
 <div body>
     <form>
         <field -repeat="f in fields" -src="[f,data]"></field>
     </form>
 </div>
 <div foot>
-    <btn white @click="close()">取消</btn>
-    <button @click="save()"> 保存 </button>
+    <btn white @click="close()">${i18n`取消`}</btn>
+    <button @click="save()"> ${i18n`保存`} </button>
 </div>

package/apps/pivot/share/list.js

@@ -5,7 +5,7 @@ function main() {
     var options = [
         {
             name(e) {
-                return this.confirm === e ? "确认取消" : "取消"
+                return this.confirm === e ? i18n`确认取消` : i18n`取消`
             },
             type: 'danger',
             confirm: false,
@@ -32,7 +32,7 @@ function main() {
             });
         },
         fields: fields.concat({
-            name: "操作",
+            name: i18n`操作`,
             width: 200,
             type: 'button',
             options,
@@ -42,7 +42,7 @@ function main() {
     scope.load();
     contextmenu(page, [
         {
-            name: "添加",
+            name: i18n`添加`,
             do(e) {
                 zimoli.prepare("/share/edit", function () {
                     var p = popup("/share/edit", { fields });

package/apps/pivot/task/edit.js

@@ -1 +1 @@
-pedit.bind(null, "任务", "task");
+pedit.bind(null, i18n`任务`, "task");

package/apps/pivot/task/invoke.html

@@ -8,12 +8,12 @@
         <field -repeat="f in fields" -src="[f,data]"></field>
     </div>
     <div class="left">
-        <jscode -value="task.code" type="js"></jscode>
+        <jscode readonly -value="task.code" type="js"></jscode>
     </div>
     <div class="right" :class="{error:error}">
         <pre -text="output"></pre>
     </div>
 </div>
 <div foot>
-    <btn @click="run">执行</btn>
+    <btn @click="run">${i18n`执行`}</btn>
 </div>

package/apps/pivot/task/invoke.js

@@ -19,12 +19,20 @@ function main(a) {
         jscode: 茨菰$编辑框,
         async run() {
             var id = ++taskid;
-            this.output = "正在执行..";
+            this.output = i18n`正在执行..`;
             this.error = false;
-            var params = JSON.stringify(this.data);
+            var params = {};
+            for (var k in this.data) {
+                var v = this.data[k];
+                try {
+                    v = JSAM.parse(v);
+                } catch { }
+                params[k] = v;
+            }
+            var params = JSON.stringify(params);
             try {
                 var res = await data.from("invoke", { key: a.key, params: encode62.packencode(params) }, function (a) {
-                    return a ? encode62.packdecode(a) : '完成！';
+                    return a ? encode62.packdecode(a) : i18n`完成！`;
                 });
                 if (id !== taskid) return;
                 this.output = res;

package/apps/pivot/task/invoke.less

@@ -13,6 +13,7 @@
     >jscode,
     >pre {
         height: 100%;
+        margin: 0;
     }
 
     &.top {
@@ -23,7 +24,8 @@
 
     &.left,
     &.right {
-        height: 100%;
+        border-radius: 0;
+        height: 260px;
         width: 50%;
     }
 

package/apps/pivot/task/list.js

@@ -5,7 +5,7 @@ model.setEditor('jscode', function (element) {
     return element;
 });
 model.setReader('jscode', "text");
-return plist.bind(null, '任务管理', "task", refilm`
+return plist.bind(null, i18n`任务管理`, "task", refilm`
 *任务ID/key 100
 *任务名/name 100
 *是否启用/status radio 不启用#ccc,启用#396
@@ -15,7 +15,7 @@ return plist.bind(null, '任务管理', "task", refilm`
             when(o) {
                 return o.status === 1;
             },
-            name: "执行", do(o) {
+            name: i18n`执行`, do(o) {
                 popup("/task/invoke", o);
             }
         },
@@ -23,7 +23,7 @@ return plist.bind(null, '任务管理', "task", refilm`
             when(o) {
                 return o.status === 1;
             },
-            name: "同步", do(o) {
+            name: i18n`同步`, do(o) {
                 popup("/task/rsync", o);
             }
         },

package/apps/pivot/task/rsync.html

@@ -1,5 +1,5 @@
 <div head>
-    同步任务&nbsp;-&nbsp; <span -text=task.name></span>(<span -text=task.key></span>)
+    ${i18n`同步任务`}&nbsp;-&nbsp; <span -text=task.name></span>(<span -text=task.key></span>)
     <close @click="remove()"></close>
 </div>
 <div body>
@@ -7,10 +7,10 @@
         <a @click="checked[h.key]=!checked[h.key]" disabled:="h.key===base.host" :class="{finished:finished[h.key]}">
             <checker -model="checked[h.key]"></checker>
             <span -text="h.name"></span>
-            <span v-if="h.key===base.host">（当前）</span>
+            <span v-if="h.key===base.host">（${i18n`当前`}）</span>
         </a>
     </padding>
 </div>
 <div foot>
-    <btn @click="flush()">同步</btn>
+    <btn @click="flush()">${i18n`同步`}</btn>
 </div>

package/apps/pivot/task/rsync.js

@@ -29,7 +29,7 @@ function main(task) {
                 });
                 finished[h.key] = true;
             }
-            alert('同步完成！');
+            alert(i18n`同步完成！`);
         },
         remove() {
             remove(page);

package/apps/pivot/token/edit.js

@@ -1 +1 @@
-pedit.bind(null, "密钥", "private");
+pedit.bind(null, i18n`密钥`, "private");

package/apps/pivot/token/list.js

@@ -1,4 +1,4 @@
-plist.bind(null, '密钥管理', "private", refilm`
+plist.bind(null, i18n`密钥管理`, "private", refilm`
 *键名/key 100
 显示名/name input/300
 密钥/value text/100

package/apps/pivot/wow/root.js

@@ -126,7 +126,7 @@ function main(path) {
         },
         async mov(from, distpath) {
             var currentHost = data.getInstance("base").base;
-            if (from.host !== currentHost) return alert("暂不支持跨服务器操作！");
+            if (from.host !== currentHost) return alert(i18n`暂不支持跨服务器操作！`);
             from = encode62.packencode(from.fullpath);
             distpath = encode62.packencode(distpath);
             await data.from("folder", { opt: 'mov', path: from, to: distpath }).loading_promise;

package/apps/pivot//344/270/273/351/241/265.html

@@ -36,7 +36,7 @@
     </style>
 </head>
 
-<body scroll=no menu="menu.yml">
+<body scroll=no>
     雪下的那么深，下的那么认真..
 </body>
 

package/coms/basic/#loader.js

@@ -494,11 +494,17 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
             for (var k in prebuilds) if (hasOwnProperty.call(prebuilds, k)) prebuilds2[k] = prebuilds[k];
             prebuilds = prebuilds2;
         }
+        var isCless = argName === 'cless';
+        if (isCless && exec[argName]) return exec[argName];
         var promise = init(aName, function (res) {
+            if (isCless) res = exec[argName] = res.bind(document.createElement('style'));
             result = res;
             created = true;
         }, prebuilds);
         if (created) return result;
+        if (isCless) promise = exec[argName] = promise.then(a => {
+            return result;
+        })
         return promise;
     });
     var _this = isModuleInit ? exports : window;
@@ -651,6 +657,7 @@ var init = function (url, then, prebuilds, keeppage) {
             if (saveAsModule) {
                 penddings[key] = created;
                 created.then(function (res) {
+                    delete penddings[key];
                     then(modules[url] = res);
                 });
                 return;

package/coms/basic/cross_.js

@@ -379,9 +379,10 @@ function cross_(jsonp, digest = noop, method, url, headers) {
             if (is_gb2312) method = method.slice(1);
             if (nocross) {
                 extend(realHeaders, _headers);
-                xhr.open(method, url);
+                method = method.toUpperCase();
+                xhr.open(method, url, true);
             } else {
-                xhr.open(method, getCrossUrl(url, _headers, isencrypt && code));
+                xhr.open(method, getCrossUrl(url, _headers, isencrypt && code), true);
             }
             if (is_gb2312) xhr.overrideMimeType("text/plain; charset=gb2312");
             if (location_href) delete realHeaders.Cookie;
@@ -393,7 +394,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
             else send.call(xhr);
             digest();
         };
-        Promise.resolve(xhr.encrypt).then(fire, onerror1);
+        Promise.resolve(xhr.encrypt).then(fire).catch(onerror1);
     }
     var setRequestHeader = xhr.setRequestHeader;
     var realHeaders = Object.create(null);

package/coms/basic/i18n-chooser.xht

@@ -0,0 +1,17 @@
+<style>
+    &>select {
+        background: inherit;
+        vertical-align: top;
+        color: inherit;
+        margin-left: -2px;
+        padding-left: 2px;
+    }
+</style>
+<template>
+    <select -model="i18n.getIndex,i18n.setIndex" title:="title()" -src="(s,i) in i18n.supports">
+        <option -value="i" -bind="s.land===s.name?'🌏'+s.land:'🌐'+s.land +' - '+s.name"></option>
+    </select>
+</template>
+<script>
+    var title = () => i18n`切换语言`;
+</script>

package/coms/basic/i18n-supports.js

@@ -0,0 +1,30 @@
+var supports = [
+    { land: i18n`中文简体`, name: `中文简体`, id: "zh", lang: "zh-CN" },
+    { land: i18n`中文繁体`, name: `中文繁體`, id: "cht", lang: "zh-TW" },
+    { land: i18n`英文`, name: `English`, id: "en", lang: "en" },
+    { land: i18n`日语`, name: `日本語`, id: "jp", lang: "ja" },
+    { land: i18n`法语`, name: `Français`, id: "fra", lang: 'fr' },
+    { land: i18n`俄语`, name: `Русский язык`, id: "ru", lang: 'ru' },
+    { land: i18n`韩语`, name: `한국어`, id: "kor", lang: "ko" },
+    { land: i18n`德语`, name: `Deutsch`, id: "de", lang: "de" },
+    { land: i18n`意大利语`, name: `Italiano`, id: "it", lang: 'it' },
+    { land: i18n`泰语`, name: `ภาษาไทย`, id: "th", lang: "th" },
+    { land: i18n`越南语`, name: `Tiếng Việt`, id: "vie", lang: 'vi' },
+    { land: i18n`阿拉伯语`, name: `بالعربية`, id: "ara", lang: "ar" },
+    { land: i18n`荷兰语`, name: `Nederlands`, id: "nl", lang: "nl" },
+    { land: i18n`芬兰语`, name: `suomi`, id: "fin", lang: "fi" },
+    { land: i18n`希腊语`, name: `Ελληνικά`, id: "el", lang: "el" },
+    { land: i18n`西班牙语`, name: `Español`, id: "spa", lang: "es" },
+    { land: i18n`葡萄牙语`, name: `Português`, id: "pt", lang: /pt\-(BR|PT)/ },
+    { land: i18n`匈牙利语`, name: `Húngaro`, id: "hu", lang: 'hu' },
+    { land: i18n`瑞典语`, name: `Svenska`, id: "swe", lang: 'sv' },
+    { land: i18n`丹麦语`, name: `Dansk`, id: "dan", lang: 'da' },
+    { land: i18n`捷克语`, name: `Čeština`, id: "cs", lang: 'cs' },
+    { land: i18n`波兰语`, name: `Polski`, id: "pl" },
+    { land: i18n`保加利亚语`, name: `Български`, id: "bul", lang: "bg" },
+    { land: i18n`爱沙尼亚语`, name: `Eesti keel`, id: "est", lang: 'et' },
+    { land: i18n`罗马尼亚语`, name: `Română`, id: "rom", lang: 'ro' },
+    { land: i18n`斯洛文尼亚语`, name: `slovenski jezik`, id: "slo", lang: 'sl' },
+];
+supports.forEach(s => s.key = s.id);
+module.exports = supports;