vap1 0.7.9 → 0.8.0

package/package.json

@@ -1 +1 @@
-{"name":"vap1","version":"0.7.9","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}
+{"name":"vap1","version":"0.8.0","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}

package/utils/Ajax.js

@@ -115,9 +115,11 @@ var FETCH = function (url, options) { return __awaiter(void 0, void 0, void 0, f
                 if (fetchOptions.body && lodash_1.default.isPlainObject(fetchOptions.body)) {
                     fetchOptions.body = JSON.stringify(fetchOptions.body);
                 }
+                fetchOptions.headers = (0, _AjaxUtil_1.appendMicorSessionHeaderForRequest)(url, fetchOptions.headers);
                 return [4 /*yield*/, fetch(url, fetchOptions)];
             case 1:
                 response = _a.sent();
+                (0, _AjaxUtil_1.receiveMicorSessionByFetch)(response);
                 if (options.process !== false)
                     done();
                 if (!lodash_1.default.isFunction(Global_1.CONFIG.AJAX.beforeReceive)) return [3 /*break*/, 3];

package/utils/XHR.d.ts

@@ -1,6 +1,6 @@
 import type { PlainObject } from '../basetype';
 /**
- * 不推荐使用同步方法，
+ * 不推荐使用同步方法
 */
 export declare const GETSYNC: (url: string) => PlainObject;
 /**

package/utils/XHR.js

@@ -22,7 +22,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.POSTSYNC = exports.GETSYNC = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var _AjaxUtil_1 = require("./_AjaxUtil");
-var FETCH = function (method, url, param) {
+var FETCH = function (method, url, param, headers) {
     var xhr = new XMLHttpRequest();
     var result = {};
     xhr.onreadystatechange = function () {
@@ -33,21 +33,22 @@ var FETCH = function (method, url, param) {
         }
     };
     xhr.open(method, url, false);
-    xhr.setRequestHeader('Content-Type', 'application/json');
+    (0, _AjaxUtil_1.setXHRHeaders)(xhr, (0, _AjaxUtil_1.mergeHeaders)({ 'Content-Type': 'application/json' }, headers));
     if (method == 'GET') {
         xhr.send();
     }
     else {
         xhr.send(JSON.stringify(param));
     }
+    (0, _AjaxUtil_1.receiveMicorSessionByXHR)(xhr);
     return result;
 };
 var _FETCH = function (method, url, param) {
     var _a = __read((0, _AjaxUtil_1.AOP_BEFORE)(url, method, {}, param), 4), _url = _a[0], _method = _a[1], _headers = _a[2], _data = _a[3];
-    return FETCH(_method == 'GET' ? 'GET' : 'POST', _url, _data);
+    return FETCH(_method == 'GET' ? 'GET' : 'POST', _url, _data, _headers);
 };
 /**
- * 不推荐使用同步方法，
+ * 不推荐使用同步方法
 */
 var GETSYNC = function (url) {
     if (_AjaxUtil_1.CACHE_URL.has(url) && sessionStorage.getItem(url)) {

package/utils/_AjaxUtil.d.ts

@@ -18,6 +18,12 @@ export declare const WAIT: (ms: number) => Promise<unknown>;
 export declare const SESSION_TIME: (url: string, second: number) => void;
 export declare const SESSION: (...urls: string[]) => Set<string>[];
 export declare const CLEAR: (...urls: string[]) => void[];
+type HeaderRecord = Record<string, string>;
+export declare const mergeHeaders: (...headersList: HeadersInit[]) => HeaderRecord;
+export declare const setXHRHeaders: (xhr: XMLHttpRequest, headers: HeadersInit) => void;
+export declare const appendMicorSessionHeaderForRequest: (url: string, headers: HeadersInit) => HeaderRecord;
+export declare const receiveMicorSessionByFetch: (response: Response) => void;
+export declare const receiveMicorSessionByXHR: (xhr: XMLHttpRequest) => void;
 export interface Result {
     code: string;
     message: string;
@@ -27,3 +33,4 @@ export declare const filterNull: (param: any) => any;
 export declare const setFixedHeader: (header: Record<string, string>) => void;
 export declare const AOP_BEFORE: (url: string, method: "GET" | "POST" | "PUT" | "DELETE" | "PATCH", headers: HeadersInit, query: PlainObject) => [string, "GET" | "POST" | "PUT" | "DELETE" | "PATCH", HeadersInit, PlainObject];
 export declare const LOG_AJAX: (url: string, method: string, param?: any) => void;
+export {};

package/utils/_AjaxUtil.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __values = (this && this.__values) || function(o) {
     var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
@@ -21,12 +10,28 @@ var __values = (this && this.__values) || function(o) {
     };
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 var e_1, _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LOG_AJAX = exports.AOP_BEFORE = exports.setFixedHeader = exports.filterNull = exports.CLEAR = exports.SESSION = exports.SESSION_TIME = exports.WAIT = exports.CACHE_TIMER = exports.CACHE_URL = void 0;
+exports.LOG_AJAX = exports.AOP_BEFORE = exports.setFixedHeader = exports.filterNull = exports.receiveMicorSessionByXHR = exports.receiveMicorSessionByFetch = exports.appendMicorSessionHeaderForRequest = exports.setXHRHeaders = exports.mergeHeaders = exports.CLEAR = exports.SESSION = exports.SESSION_TIME = exports.WAIT = exports.CACHE_TIMER = exports.CACHE_URL = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var _Support_1 = require("./_Support");
 var Global_1 = require("./Global");
@@ -69,6 +74,209 @@ var CLEAR = function () {
 };
 exports.CLEAR = CLEAR;
 var sessionStorage = window.sessionStorage;
+var MICOR_SESSION_STORAGE = 'MICOR_SESSION';
+var MICOR_SESSION_RESPONSE_HEADER = 'set-cems-cookies';
+var MICOR_SESSION_REQUEST_HEADER = 'cems-cookies';
+var hasMicorApp = function () {
+    return lodash_1.default.has(window, 'microApp');
+};
+var readMicorSessionStore = function () {
+    var value = sessionStorage.getItem(MICOR_SESSION_STORAGE);
+    if (!value)
+        return {};
+    try {
+        return JSON.parse(value);
+    }
+    catch (_a) {
+        return {};
+    }
+};
+var splitMicorSessionHeader = function (headerValue) {
+    return headerValue.split(/,(?=\s*[^;,=\s]+=)/g).map(function (value) { return lodash_1.default.trim(value); }).filter(Boolean);
+};
+var normalizePath = function (path) {
+    if (!path)
+        return '/';
+    return path.charAt(0) == '/' ? path : "/".concat(path);
+};
+var resolvePathname = function (url) {
+    var parser = document.createElement('a');
+    parser.href = url;
+    return normalizePath(parser.pathname || '/');
+};
+var isPathMatched = function (requestPath, cookiePath) {
+    var path = normalizePath(cookiePath);
+    if (path == '/')
+        return true;
+    if (requestPath == path)
+        return true;
+    if (lodash_1.default.endsWith(path, '/'))
+        return lodash_1.default.startsWith(requestPath, path);
+    return lodash_1.default.startsWith(requestPath, path) && requestPath.charAt(path.length) == '/';
+};
+var parseMicorSessionCookie = function (cookieValue) {
+    var e_2, _a;
+    var values = cookieValue.split(';').map(function (value) { return lodash_1.default.trim(value); }).filter(Boolean);
+    if (values.length == 0)
+        return null;
+    var cookiePair = values[0];
+    var idx = cookiePair.indexOf('=');
+    if (idx <= 0)
+        return null;
+    var path = '/';
+    try {
+        for (var values_1 = __values(values), values_1_1 = values_1.next(); !values_1_1.done; values_1_1 = values_1.next()) {
+            var value = values_1_1.value;
+            var attrIdx = value.indexOf('=');
+            var attrName = lodash_1.default.toLower(attrIdx >= 0 ? value.substring(0, attrIdx) : value);
+            if (attrName == 'path') {
+                path = attrIdx >= 0 ? lodash_1.default.trim(value.substring(attrIdx + 1)) : '/';
+                break;
+            }
+        }
+    }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    finally {
+        try {
+            if (values_1_1 && !values_1_1.done && (_a = values_1.return)) _a.call(values_1);
+        }
+        finally { if (e_2) throw e_2.error; }
+    }
+    return {
+        name: cookiePair.substring(0, idx),
+        path: normalizePath(path),
+        value: cookiePair.substring(idx + 1),
+        source: cookieValue,
+    };
+};
+var receiveMicorSession = function (headerValue) {
+    if (!hasMicorApp())
+        return;
+    if (!headerValue)
+        return;
+    var store = readMicorSessionStore();
+    splitMicorSessionHeader(headerValue).forEach(function (value) {
+        var cookie = parseMicorSessionCookie(value);
+        if (cookie == null)
+            return;
+        if (!store[cookie.path])
+            store[cookie.path] = {};
+        store[cookie.path][cookie.name] = {
+            value: cookie.value,
+            source: cookie.source,
+        };
+    });
+    sessionStorage.setItem(MICOR_SESSION_STORAGE, JSON.stringify(store));
+};
+var getMatchedMicorSession = function (url) {
+    if (!hasMicorApp())
+        return '';
+    var store = readMicorSessionStore();
+    var requestPath = resolvePathname(url);
+    if (lodash_1.default.keys(store).length == 0)
+        return '';
+    var matchedPath = lodash_1.default.keys(store)
+        .filter(function (path) { return isPathMatched(requestPath, path); })
+        .sort(function (a, b) { return b.length - a.length; })[0];
+    if (!matchedPath)
+        return '';
+    return lodash_1.default.keys(store[matchedPath])
+        .map(function (name) { return "".concat(name, "=").concat(store[matchedPath][name].value); })
+        .join('; ');
+};
+var findHeaderKey = function (headers, headerName) {
+    var lowerName = lodash_1.default.toLower(headerName);
+    return lodash_1.default.find(lodash_1.default.keys(headers), function (key) { return lodash_1.default.toLower(key) == lowerName; });
+};
+var mergeHeaders = function () {
+    var headersList = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        headersList[_i] = arguments[_i];
+    }
+    var result = {};
+    headersList.filter(Boolean).forEach(function (headers) {
+        if (typeof Headers != 'undefined' && headers instanceof Headers) {
+            headers.forEach(function (value, key) {
+                result[findHeaderKey(result, key) || key] = value;
+            });
+            return;
+        }
+        if (lodash_1.default.isArray(headers)) {
+            headers.forEach(function (header) {
+                var _a = __read(header, 2), key = _a[0], value = _a[1];
+                if (value != null)
+                    result[findHeaderKey(result, key) || key] = value;
+            });
+            return;
+        }
+        lodash_1.default.keys(headers).forEach(function (key) {
+            var value = headers[key];
+            if (value != null)
+                result[findHeaderKey(result, key) || key] = value;
+        });
+    });
+    return result;
+};
+exports.mergeHeaders = mergeHeaders;
+var appendCookieHeader = function (current, value) {
+    if (!current)
+        return value;
+    var exists = new Set();
+    current.split(';').map(function (item) { return lodash_1.default.trim(item); }).filter(Boolean).forEach(function (item) {
+        exists.add(lodash_1.default.toLower(item.split('=')[0]));
+    });
+    var additions = value.split(';').map(function (item) { return lodash_1.default.trim(item); }).filter(Boolean).filter(function (item) {
+        return !exists.has(lodash_1.default.toLower(item.split('=')[0]));
+    });
+    if (additions.length == 0)
+        return current;
+    return "".concat(current, "; ").concat(additions.join('; '));
+};
+var appendMicorSessionHeader = function (url, headers) {
+    var result = (0, exports.mergeHeaders)(headers);
+    var session = getMatchedMicorSession(url);
+    if (!session)
+        return result;
+    var headerKey = findHeaderKey(result, MICOR_SESSION_REQUEST_HEADER) || MICOR_SESSION_REQUEST_HEADER;
+    var oldHeaderValue = result[headerKey];
+    result[headerKey] = appendCookieHeader(oldHeaderValue, session);
+    return result;
+};
+var setXHRHeaders = function (xhr, headers) {
+    var requestHeaders = (0, exports.mergeHeaders)(headers);
+    lodash_1.default.keys(requestHeaders).forEach(function (key) { return xhr.setRequestHeader(key, requestHeaders[key]); });
+};
+exports.setXHRHeaders = setXHRHeaders;
+var clearMicorSession = function (path) {
+    if (!lodash_1.default.isString(path)) {
+        sessionStorage.removeItem(MICOR_SESSION_STORAGE);
+        return;
+    }
+    var store = readMicorSessionStore();
+    delete store[normalizePath(path)];
+    sessionStorage.setItem(MICOR_SESSION_STORAGE, JSON.stringify(store));
+};
+var MICOR_SESSION = {
+    requestHeader: MICOR_SESSION_REQUEST_HEADER,
+    responseHeader: MICOR_SESSION_RESPONSE_HEADER,
+    receive: receiveMicorSession,
+    receiveByFetch: function (response) { return receiveMicorSession(response.headers.get(MICOR_SESSION_RESPONSE_HEADER)); },
+    receiveByXHR: function (xhr) { return receiveMicorSession(xhr.getResponseHeader(MICOR_SESSION_RESPONSE_HEADER)); },
+    appendHeader: appendMicorSessionHeader,
+    get: function (path) {
+        var store = readMicorSessionStore();
+        if (lodash_1.default.isString(path))
+            return store[normalizePath(path)] || {};
+        return store;
+    },
+    clear: clearMicorSession,
+};
+var appendMicorSessionHeaderForRequest = function (url, headers) { return MICOR_SESSION.appendHeader(url, headers); };
+exports.appendMicorSessionHeaderForRequest = appendMicorSessionHeaderForRequest;
+var receiveMicorSessionByFetch = function (response) { return MICOR_SESSION.receiveByFetch(response); };
+exports.receiveMicorSessionByFetch = receiveMicorSessionByFetch;
+var receiveMicorSessionByXHR = function (xhr) { return MICOR_SESSION.receiveByXHR(xhr); };
+exports.receiveMicorSessionByXHR = receiveMicorSessionByXHR;
 //过滤空参数
 var filterNull = function (param) {
     if (!lodash_1.default.isObject(param))
@@ -118,7 +326,7 @@ if (FIXED_STORAGE) {
     }
 }
 var setFixedHeader = function (header) {
-    var e_2, _a;
+    var e_3, _a;
     var keys = lodash_1.default.keys(header);
     try {
         for (var keys_2 = __values(keys), keys_2_1 = keys_2.next(); !keys_2_1.done; keys_2_1 = keys_2.next()) {
@@ -126,12 +334,12 @@ var setFixedHeader = function (header) {
             FIXED_HEADER[key] = header[key];
         }
     }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    catch (e_3_1) { e_3 = { error: e_3_1 }; }
     finally {
         try {
             if (keys_2_1 && !keys_2_1.done && (_a = keys_2.return)) _a.call(keys_2);
         }
-        finally { if (e_2) throw e_2.error; }
+        finally { if (e_3) throw e_3.error; }
     }
     sessionStorage.setItem(FIXED_HEADER_STROE, JSON.stringify(FIXED_HEADER));
 };
@@ -139,10 +347,11 @@ exports.setFixedHeader = setFixedHeader;
 exports.AOP_BEFORE = (0, _Support_1.globalDefault)('_VAP_BEFORE_SEND', function (url, method, headers, query) {
     var data = method == 'POST' ? (0, exports.filterNull)(query) : query;
     var resloveApiRoot = rewriteApiRoot(url);
+    var requestHeaders = appendMicorSessionHeader(resloveApiRoot, (0, exports.mergeHeaders)(FIXED_HEADER, headers));
     if (lodash_1.default.isFunction(Global_1.CONFIG.AJAX.beforeSend)) {
-        return Global_1.CONFIG.AJAX.beforeSend(resloveApiRoot, method, __assign(__assign({}, FIXED_HEADER), headers), data);
+        return Global_1.CONFIG.AJAX.beforeSend(resloveApiRoot, method, requestHeaders, data);
     }
-    return [resloveApiRoot, method, __assign(__assign({}, FIXED_HEADER), { headers: headers }), data];
+    return [resloveApiRoot, method, requestHeaders, data];
 });
 var CODES = { bold: [1, 22], green: [32, 39], blue: [34, 39], bgYellow: [43, 49], bgGray: [100, 49] };
 var SIGN = '\u001b[';