efront 3.33.1 → 3.33.3

package/coms/basic/assert.js

@@ -14,12 +14,12 @@ var assert = function (result, expect, log = dump) {
         if (k === undefined) return function () {
             var color1 = "bgred";
             var color2 = "bgblue";
-            mark.setTag1(` </${color1}>`, `<${color1}>`);
-            mark.setTag2(` </${color2}>`, `<${color2}>`);
+            mark.setTag1(`</${color1}>`, `<${color1}>`);
+            mark.setTag2(`</${color2}>`, `<${color2}>`);
             var [r, e] = mark.pair(result, expect);
-            r = String(r).trim();
-            e = String(e).trim();
-            errors = `<cyan>结果  </cyan><${color1}>${r}</${color1}>\r\n      <cyan>应为  </cyan><${color2}>${e}</${color2}>\r\n`;
+            r = String(r).trim().replace(/><\//g, "> </");
+            e = String(e).trim().replace(/><\//g, "> </");
+            errors = `<cyan>结果  </cyan>\x07<${color1}>${r}</${color1}>\r\n      <cyan>应为  </cyan><${color2}>${e}</${color2}>\r\n`;
         };
         return function (error) {
             if (error instanceof Object) {

package/coms/basic/cookie.js

@@ -1,4 +1,3 @@
-var cookiesMap = {};
 var parseCookieFromText = function (cookie) {
     var pairs = cookie.split(/;\s*/);
     var info = {};
@@ -22,7 +21,12 @@ var parseCookieFromText = function (cookie) {
     return [pair, info];
 };
 
-function addCookie(cookie_text, originDomain = "") {
+class Cookie {
+    cookiesMap = {};
+}
+var CookieProto = Cookie.prototype;
+CookieProto.addCookie = function addCookie(cookie_text, originDomain = "") {
+    var { cookiesMap } = this;
     originDomain = getDomainPath(originDomain);
     if (!cookie_text) return;
     if (cookie_text instanceof Array) cookie_text = cookie_text.join(",");
@@ -57,7 +61,8 @@ function addCookie(cookie_text, originDomain = "") {
     }
 }
 
-function getCookies(domainPath) {
+CookieProto.getCookies = function getCookies(domainPath) {
+    var { cookiesMap } = this;
     domainPath = getDomainPath(domainPath);
     var cookieObject = {};
     var splited = domainPath.split("/");
@@ -88,7 +93,8 @@ function getCookies(domainPath) {
     return serialize(cookieObject, ";");
 }
 
-function delCookies(domainPath) {
+CookieProto.delCookies = function delCookies(domainPath) {
+    var { cookiesMap } = this;
     domainPath = getDomainPath(domainPath);
     var splited = domainPath.split("/");
     var domain = splited[0];
@@ -100,7 +106,8 @@ function getDomainPath(url) {
     return host;
 }
 
-function linkCookie(from, to) {
+CookieProto.linkCookie = function linkCookie(from, to) {
+    var { cookiesMap } = this;
     from = getDomainPath(from).replace(/\/$/, '');
     to = getDomainPath(to).replace(/\/$/, '');
     if (cookiesMap[from]) {
@@ -109,7 +116,8 @@ function linkCookie(from, to) {
     cookiesMap[to] = cookiesMap[from] = extend({}, cookiesMap[to], cookiesMap[from]);
     return to;
 }
-function copyCookie(from, to) {
+CookieProto.copyCookie = function copyCookie(from, to) {
+    var { cookiesMap } = this;
     from = getDomainPath(from).replace(/\/$,'/, '');
     to = getDomainPath(to).replace(/\/$/, '');
     if (from in cookiesMap) {
@@ -119,12 +127,6 @@ function copyCookie(from, to) {
         delete cookiesMap[to];
     }
 }
-
-return {
-    cookiesMap,
-    addCookie,
-    getCookies,
-    delCookies,
-    linkCookie,
-    copyCookie
-}
+var defaultCookie = new Cookie;
+defaultCookie.new = () => new Cookie;
+return defaultCookie;

package/coms/basic/cross_.js

@@ -1,4 +1,3 @@
-var { getCookies, addCookie, delCookies } = cookie;
 var { File } = this;
 function hasFile(o) {
     if (!File) return false;
@@ -43,14 +42,7 @@ var getCrossUrl = function (domain, headers, encrypt) {
         if (!encrypt) return domain;
         domain = domain.replace(domainReg, "/$3$4");
     }
-    var originDomain = getDomainPath(domain);
-    var _cookies = getCookies(originDomain);
-    var _headers = {};
-    if (_cookies) {
-        _headers.Cookie = _cookies;
-    }
-    extend(_headers, headers);
-    _headers = serialize(_headers);
+    var _headers = serialize(headers);
     if (_headers) _headers = "," + _headers;
     var b = encrypt ? "!" : `*`;
     var ishttps = /^(https\:|s\/\/)/i.test(domain);
@@ -137,18 +129,6 @@ function createResponse(response, status = 0) {
 function cross_(jsonp, digest = noop, method, url, headers) {
     var originDomain = getDomainPath(url);
     if (!originDomain) throw new Error("路径格式错误！");
-    var _cookies = getCookies(originDomain);
-    var _headers = {};
-    if (_cookies) {
-        _headers.Cookie = _cookies;
-    }
-    extend(_headers, headers);
-    if (/^[mc]/i.test(method)) {
-        _headers["User-Agent"] = /^m/i.test(method)
-            ? "efront/3.25 (iPhone) Safari/602.1"
-            : "efront/3.25 (Windows) Chrome/77.0.3865.90";
-        method = method.slice(1);
-    }
     var loaded, errored;
     var onload = function (data) {
         if (!~requests.indexOf(_xhr)) return;
@@ -232,7 +212,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                             onerror({ status: xhr.status, response: "Cookie解析异常!", toString: toResponse });
                             return;
                         }
-                        addCookie(cookie, originDomain);
+                        cookie_.addCookie(cookie, originDomain);
                     }
 
                 }
@@ -385,6 +365,20 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     }
     var setRequestHeader = xhr.setRequestHeader;
     var realHeaders = Object.create(null);
+    var cookie_ = this.hostCookie(xhr);
+    var _cookies = cookie_.getCookies(originDomain);
+    var _headers = {};
+    if (_cookies) {
+        _headers.Cookie = _cookies;
+    }
+    extend(_headers, headers);
+    if (/^[mc]/i.test(method)) {
+        _headers["User-Agent"] = /^m/i.test(method)
+            ? "efront/3.25 (iPhone) Safari/602.1"
+            : "efront/3.25 (Windows) Chrome/77.0.3865.90";
+        method = method.slice(1);
+    }
+
     xhr.setRequestHeader = function (key, value) {
         realHeaders[key] = value;
     };
@@ -412,12 +406,12 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     };
     xhr.abort = XMLHttpRequest_abort;
     xhr.delCookies = function () {
-        delCookies(originDomain);
+        cookie_.delCookies(originDomain);
         xhr.nocookie = true;
         return xhr;
     };
     xhr.getCookies = function () {
-        return getCookies(originDomain);
+        return cookie_.getCookies(originDomain);
     };
     requests.push(xhr);
     var _xhr = xhr;
@@ -471,6 +465,7 @@ var bind = cross_.bind;
 cross_.bind = function () {
     var cross_ = bind.apply(this, arguments);
     arguments[0].getCode = getCode.bind(cross_);
+    arguments[0].hostCookie = function () { return cross_.hostCookie.apply(this, arguments) };
     extend(cross_, {
         requests,
         abortAll() {
@@ -478,8 +473,6 @@ cross_.bind = function () {
         },
         setHost,
         addReform,
-        getCookies,
-        addCookie,
         addDirect,
         getCrossUrl
     });

package/coms/reptile/cross.js

@@ -1,4 +1,4 @@
-return cross_.bind(function (callback, onerror) {
+var cross = cross_.bind(function (callback, onerror) {
     var response, responseObject, responseType = "", decoder, error;
     var xhr = {
         status: 0,
@@ -115,4 +115,8 @@ return cross_.bind(function (callback, onerror) {
         },
     };
     return xhr;
-}, null, undefined);
+}, null, undefined);
+cross.hostCookie = function (xhr) {
+    if (xhr.cookie) return xhr.cookie;
+    return xhr.cookie = cookie.new();
+};

package/coms/zimoli/cross.js

@@ -56,4 +56,16 @@ cross.setHost = function (host) {
     host = (/^https/.test(location_href) ? "https://" : "http://") + host;
     cross_.setHost(host);
 };
+cross.hostCookie = function () {
+    return cookie;
+};
+cross.getCookies = function (dp) {
+    return cookie.getCookies(dp)
+};
+cross.addCookie = function (cookie_text, dp) {
+    return cookie.addCookie(cookie_text, dp);
+};
+cross.delCookies = function (dp) {
+    return cookie.delCookies(dp);
+};
 if (cross_host) cross.setHost(cross_host);

package/package.json

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