pb-sxp-ui 1.11.0 → 1.12.0

package/lib/core/context/SxpDataSourceProvider.js

@@ -39,7 +39,6 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     const themeTag = (0, react_1.useRef)();
     const curTime = (0, react_1.useRef)();
     const multiPostTimeRef = (0, react_1.useRef)();
-    const sessionTimeRef = (0, react_1.useRef)();
     const [selectTag, setSelectTag] = (0, react_1.useState)(exports.DEFAULT_TAG);
     const checkCommodityIndexRef = (0, react_1.useRef)(-1);
     const popupCurTimeRef = (0, react_1.useRef)(null);
@@ -212,20 +211,27 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         setCacheRtcList(cacheRtcList.concat(getFilterRecList(data)));
         return data;
     }), [getRecommendVideos, rtcList, waterFallData, cacheRtcList]);
-    const refreshFeSession = (0, react_1.useCallback)(() => {
-        var _a, _b, _c, _d, _e, _f;
+    const refreshFeSession = (0, react_1.useCallback)((enableReSid, event) => {
+        var _a, _b, _c, _d, _e;
+        let expire = false;
         const defaultGlobalConfig = (_b = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.sxpPageConf) === null || _b === void 0 ? void 0 : _b.globalConfig;
         if ((_c = defaultGlobalConfig === null || defaultGlobalConfig === void 0 ? void 0 : defaultGlobalConfig.session) === null || _c === void 0 ? void 0 : _c.enable) {
-            if (Math.floor((new Date() - ((_d = sessionTimeRef.current) !== null && _d !== void 0 ? _d : new Date())) / (1000 * 60)) >=
-                ((_f = (_e = defaultGlobalConfig === null || defaultGlobalConfig === void 0 ? void 0 : defaultGlobalConfig.session) === null || _e === void 0 ? void 0 : _e.expires) !== null && _f !== void 0 ? _f : 30)) {
+            const sessionStartTime = localStorage.getItem('sessionStartTime');
+            const sst = sessionStartTime ? JSON.parse(sessionStartTime) : new Date().getTime();
+            if (Math.floor((new Date().getTime() - sst) / 1000 / 60) >=
+                ((_e = (_d = defaultGlobalConfig === null || defaultGlobalConfig === void 0 ? void 0 : defaultGlobalConfig.session) === null || _d === void 0 ? void 0 : _d.expires) !== null && _e !== void 0 ? _e : 30)) {
+                event === null || event === void 0 ? void 0 : event('sessionTimeOut');
                 (0, sessionStore_1.refreshFeSessionId)();
+                curTime.current = new Date();
+                expire = true;
             }
+            localStorage.setItem('sessionStartTime', JSON.stringify(new Date().getTime()));
         }
-        else {
+        else if (enableReSid) {
             (0, sessionStore_1.refreshFeSessionId)();
         }
-        sessionTimeRef.current = new Date();
-    }, [data, sessionTimeRef]);
+        return expire;
+    }, [data]);
     const bffEventReport = (0, react_1.useCallback)(({ userInfo, eventInfo, reportLayId = true }) => {
         if (!enableReportEvent || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview)) {
             return;
@@ -233,7 +239,6 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         if (!userInfo) {
             userInfo = {};
         }
-        refreshFeSession();
         const sessionID = (0, sessionStore_1.storeAndLoadFeSessionId)();
         const ef = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ sessionID, rtc: curReqInfo.rtc, requestId: curReqInfo.requestId }, { playbookType }), (layoutVariantId && reportLayId && { layoutVariantId })), eventInfo), ((0, tool_1.getDevice)() && { sxpDevice: (0, tool_1.getDevice)() })), ((0, tool_1.getSystem)() && { sxpSystem: (0, tool_1.getSystem)() })), ((0, tool_1.getBrowserInfo)() && { sxpBrowser: (0, tool_1.getBrowserInfo)() })), ((eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) && channel && { position: Number(eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) + 1 + '' }));
         const realUserInfo = Object.entries(userInfo).map(([k, v]) => ({ name: k, value: v }));
@@ -249,16 +254,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             body: { userInfo: realUserInfo, eventInfo: realEventInfo },
             type: 'beacon'
         });
-    }, [
-        bffFetch,
-        curReqInfo,
-        enableReportEvent,
-        globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview,
-        layoutVariantId,
-        globalConfig,
-        playbookType,
-        refreshFeSession
-    ]);
+    }, [bffFetch, curReqInfo, enableReportEvent, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview, layoutVariantId, globalConfig, playbookType]);
     const bffFbReport = (0, react_1.useCallback)(({ eventName, product }) => {
         var _a, _b, _c, _d, _e;
         if (!enableReportEvent ||
@@ -383,7 +379,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         });
     }, [bffEventReport, isFromHashtag]);
     const h5EnterLink = (0, react_1.useCallback)(() => {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         const queryString = location.search.slice(1);
         const params = qs_1.default.parse(queryString.replace(/\+/g, '%2B'));
         for (const key in params) {
@@ -391,7 +387,10 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         }
         const getVal = (key) => { var _a; return (_a = params[key]) !== null && _a !== void 0 ? _a : ''; };
         const time = new Date();
-        curTime.current = time;
+        const defaultGlobalConfig = (_b = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.sxpPageConf) === null || _b === void 0 ? void 0 : _b.globalConfig;
+        if (!((_c = defaultGlobalConfig === null || defaultGlobalConfig === void 0 ? void 0 : defaultGlobalConfig.session) === null || _c === void 0 ? void 0 : _c.enable) || !(curTime === null || curTime === void 0 ? void 0 : curTime.current)) {
+            curTime.current = time;
+        }
         bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
             eventInfo: {
                 eventSubject: 'h5LinkEnterFeed',
@@ -403,12 +402,12 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 utmContent: getVal('utm_content'),
                 enterTime: Math.floor(time / 1000) + '',
                 requestId: null,
-                enterUrl: (_b = (_a = window === null || window === void 0 ? void 0 : window.location) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : '',
+                enterUrl: (_e = (_d = window === null || window === void 0 ? void 0 : window.location) === null || _d === void 0 ? void 0 : _d.href) !== null && _e !== void 0 ? _e : '',
                 clSource: getVal('cl_source')
             },
             reportLayId: false
         });
-    }, [bffEventReport]);
+    }, [bffEventReport, data, curTime]);
     (0, react_1.useEffect)(() => {
         if (!isShowConsent)
             h5EnterLink();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pb-sxp-ui",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "description": "React enterprise-class UI components",
   "main": "dist/index.cjs",
   "module": "dist/index.js",