efront 4.5.16 → 4.5.17

package/apps/pivot/log/boot.js

@@ -1,48 +1,10 @@
-var checkPort = async function (p, ip) {
-    if (!p.host) {
-        if (/^::ffff:\d+\.\d+\.\d+\.\d+$/i.test(ip)) {
-            ip = ip.slice(7);
-        }
-        else {
-            ip = `[${ip}]`;
-        }
-        p.locate(ip);
-    }
-    try {
-        p.locate("/:version");
-        var xhr = await cross("@options", p.href);
-        if (/^efront/.test(xhr.response)) {
-            p.ok = true;
-        }
-        else {
-            p.error = '异常';
-        }
-    } catch (e) {
-        p.error = e;
-    }
-
-}
 var fields = refilm`
 IP地址/ip text/120
-地理位置/address/查看 act/80 ${async function (a) {
-        var ip = a.ip;
-        var m = /(\d+\.){3}\d+$/.exec(ip);
-        var { address } = await data.from("iplocation", { ip: m ? m[0] : ip });
-        a.address = address;
-    }}
+地理位置/address/查看 act/80 ${checkGeo}
 启动时间/time ${function (e) {
         e.innerHTML = filterTime(e.data[e.field.key]);
     }}
-绑定地址/port 120/${async function (e) {
-        var { data, field } = e;
-        var ports = data[field.key].split(/,/).map(p => parseURL(p));
-        e.innerHTML = `<a -repeat="p in ports" @click="checkPort(p,ip)" -class="{ok:p.ok,error:p.error}"><span -bind=p></span></a>`;
-        render(e, {
-            ports,
-            ip: data.ip,
-            checkPort,
-        })
-    }}
+绑定地址/port 120/${checkPort}
 版本/version input
 进程/pid
 `;

package/apps/pivot/log/count.js

@@ -6,6 +6,7 @@ var fields2 = refilm`
 域名/host text/100
 路径/path text/80
 远程地址/remote text/100
+地理位置/address/查看 act/80 ${checkGeo}
 时间/time timestamp
 来源/referer text/100
 客户端/agent text/200

package/coms/compile/Javascript.js

@@ -20,6 +20,7 @@ const {
     getDeclared,
     createScoped,
     snapExpressHead,
+    patchArrawScope,
     snapExpressFoot,
     splice,
     relink,
@@ -481,11 +482,6 @@ Javascript.prototype.detour = function (body, ie) {
     context = null;
     return envs;
 }
-var getfunc = function (o, k) {
-    var q = o.queue;
-    while (q && (!q.scoped || !q.scoped.used[k])) q = q.queue;
-    return q;
-};
 var context = null, rootenvs = null;
 function detour(o, ie) {
     while (o) {
@@ -514,15 +510,7 @@ function detour(o, ie) {
                     if (hasdot) text = "..." + text;
                     var o1 = scan(text);
                     detour(o1.first, ie);
-                    var s1 = createScoped(o1);
-                    if (s1.used.this) {
-                        var s = getfunc(o, 'this').scoped;
-                        s.used.this.push(...s1.used.this);
-                    }
-                    if (s1.used.arguments) {
-                        var s = getfunc(o, 'arguments').scoped;
-                        s.used.arguments.push(...s1.used.arguments);
-                    };
+                    patchArrawScope(o1, o);
                     replace(o, ...o1);
                     o = o1.last;
                     continue;

package/coms/compile/common.js

@@ -1483,7 +1483,27 @@ var unshort = function (o, text) {
     o.isprop = false;
     o.type = EXPRESS;
     delete o.short;
-}
+};
+var getScopeWith = function (o, k) {
+    var q = o.queue;
+    while (q && (!q.scoped || !q.scoped.used[k])) q = q.queue;
+    return q;
+};
+
+var patchArrawScope = function (arraw, origin) {
+    var s1 = createScoped(arraw);
+    if (s1.used.this) {
+        var s = getScopeWith(origin, 'this').scoped;
+        s.used.this.push(...s1.used.this);
+        s.insett = true;
+    }
+    if (s1.used.arguments) {
+        s.inseta = true;
+        var s = getScopeWith(origin, 'arguments').scoped;
+        s.used.arguments.push(...s1.used.arguments);
+    };
+};
+
 module.exports = {
     /*   1 */COMMENT,
     /*   2 */SPACE,
@@ -1502,6 +1522,8 @@ module.exports = {
     unshort,
     skipAssignment,
     getDeclared,
+    getScopeWith,
+    patchArrawScope,
     remove,
     createString,
     createScoped,

package/coms/compile/translate.js

@@ -1,5 +1,5 @@
 var scanner2 = require("./scanner2");
-var { SCOPED, QUOTED, SCOPED, PROPERTY, STAMP, PIECE, setqueue, splice, relink, number_reg, replace, canbeDuplicate, createString } = require("./common");
+var { SCOPED, QUOTED, SCOPED, PROPERTY, STAMP, PIECE, setqueue, splice, relink, patchArrawScope, number_reg, replace, canbeDuplicate, createString } = require("./common");
 var strings = require("../basic/strings");
 var program = null;
 var patchTranslate = function (c) {
@@ -88,7 +88,8 @@ var ctn = function (tt, t) {
             if (e in t) n[i] = t[e];
         });
         relink(n);
-    })
+    });
+    patchArrawScope(tn, t);
     return tn;
 }
 var warningMap = Object.create(null);

package/coms/pivot/checkGeo.js

@@ -0,0 +1,6 @@
+return async function (a) {
+    var ip = a.ip || a.remote;
+    var m = /(\d+\.){3}\d+$/.exec(ip);
+    var { address } = await data.from("iplocation", { ip: m ? m[0] : ip });
+    a.address = address;
+}

package/coms/pivot/checkPort.js

@@ -0,0 +1,35 @@
+var checkPort = async function (p, ip) {
+    if (!p.host) {
+        if (/^::ffff:\d+\.\d+\.\d+\.\d+$/i.test(ip)) {
+            ip = ip.slice(7);
+        }
+        else {
+            ip = `[${ip}]`;
+        }
+        p.locate(ip);
+    }
+    try {
+        p.locate("/:version");
+        var xhr = await cross("@options", p.href);
+        if (/^efront/.test(xhr.response)) {
+            p.ok = true;
+        }
+        else {
+            p.error = '异常';
+        }
+    } catch (e) {
+        p.error = e;
+    }
+
+}
+
+return async function (e) {
+    var { data, field } = e;
+    var ports = data[field.key].split(/,/).map(p => parseURL(p));
+    e.innerHTML = `<a -repeat="p in ports" @click="checkPort(p,ip)" -class="{ok:p.ok,error:p.error}"><span -bind=p></span></a>`;
+    render(e, {
+        ports,
+        ip: data.ip,
+        checkPort,
+    })
+}

package/coms/zimoli/forceUpdate.js

@@ -18,6 +18,6 @@ if (preventCache && navigator) {
         } else {
             search = "=" + mark_time.toString(36);
         }
-        if (!/Safari|Firefox|Sciter/.test(navigator.userAgent)) location.replace(location.pathname + "?" + search);
+        if (!/Safari|Firefox|Sciter|Baiduspider|PetalBot|Googlebot|Odin/.test(navigator.userAgent)) location.replace(location.pathname + "?" + search);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.5.16",
+    "version": "4.5.17",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {