@fe-free/core 2.8.8 → 2.8.10

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @fe-free/core
 
+## 2.8.10
+
+### Patch Changes
+
+- fix: update
+  - @fe-free/tool@2.8.10
+
+## 2.8.9
+
+### Patch Changes
+
+- fix: update
+  - @fe-free/tool@2.8.9
+
 ## 2.8.8
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "2.8.8",
+  "version": "2.8.10",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -42,7 +42,7 @@
     "safe-stable-stringify": "^2.5.0",
     "vanilla-jsoneditor": "^0.23.1",
     "zustand": "^4.5.4",
-    "@fe-free/tool": "2.8.8"
+    "@fe-free/tool": "2.8.10"
   },
   "peerDependencies": {
     "@ant-design/pro-components": "2.8.9",

package/src/core_app/index.tsx

@@ -7,6 +7,13 @@ import { BrowserRouter as Router, useNavigate } from 'react-router-dom';
 import { routeTool } from '../route';
 import { customValueTypeMap } from '../value_type_map';
 
+function getPathname(src?: string) {
+  if (!src) {
+    return null;
+  }
+  return src.startsWith('/') ? src : new URL(src).pathname;
+}
+
 function CheckUpdate({ basename }: { basename: string }) {
   const { modal } = App.useApp();
 
@@ -17,13 +24,14 @@ function CheckUpdate({ basename }: { basename: string }) {
       return;
     }
 
-    async function getMainScriptSrc() {
+    async function getMainScriptPathname() {
       const res = await fetch(`${basename}?r=${Date.now()}`);
       const html = await res.text();
       const parser = new DOMParser();
       const doc = parser.parseFromString(html, 'text/html');
       const nextMainScript = doc.querySelector('[data-name="mainScript"]');
-      return nextMainScript?.getAttribute('src');
+      const src = nextMainScript?.getAttribute('src');
+      return getPathname(src || undefined);
     }
 
     let ing = false;
@@ -49,13 +57,19 @@ function CheckUpdate({ basename }: { basename: string }) {
     }
 
     const src = mainScript.getAttribute('src');
+    const pathname = getPathname(src || undefined);
+
+    const checkUpdateInterval = parseInt(
+      localStorage.getItem('__free-checkUpdateInterval') || '60000',
+      10,
+    );
     const timer = setInterval(async () => {
-      const nextSrc = await getMainScriptSrc();
-      if (nextSrc !== src) {
+      const nextPathname = await getMainScriptPathname();
+      if (nextPathname !== pathname) {
         confirm();
         return;
       }
-    }, 1000 * 60);
+    }, checkUpdateInterval);
 
     return () => {
       clearInterval(timer);